From ce184a78a2836c9f116ac01526a0ec2409b351d8 Mon Sep 17 00:00:00 2001
From: Joe Hill <hillj1895@yahoo.com>
Date: Fri, 24 Mar 2017 17:40:00 -0400
Subject: [PATCH] Lots of unfinished things

---
 bin/controller/Cashflow.class             | Bin 1566 -> 1765 bytes
 src/controller/Cashflow.java              |  23 ++++-
 src/model/CardStack.java                  |   4 +-
 src/model/CharityTile                     |  10 --
 src/model/CharityTile.java                |  11 ++
 src/model/ChildTile                       |  10 --
 src/model/ChildTile.java                  |  10 ++
 src/model/DealTile                        |  10 --
 src/model/DealTile.java                   |  10 ++
 src/model/DoodadTile.java                 |   9 ++
 src/model/GameBoard.java                  |  17 +++-
 src/model/MarketStack.java                |  13 +--
 src/model/{MarketTile => MarketTile.java} |   0
 src/model/PaydayTile                      |  10 --
 src/model/PaydayTile.java                 |  10 ++
 src/model/Player.java                     |   2 +-
 src/model/Tile.java                       |  18 +++-
 src/model/TileCircularLinkedList.java     | 116 ++++++++++++++++++++++
 18 files changed, 225 insertions(+), 58 deletions(-)
 delete mode 100644 src/model/CharityTile
 create mode 100644 src/model/CharityTile.java
 delete mode 100644 src/model/ChildTile
 create mode 100644 src/model/ChildTile.java
 delete mode 100644 src/model/DealTile
 create mode 100644 src/model/DealTile.java
 create mode 100644 src/model/DoodadTile.java
 rename src/model/{MarketTile => MarketTile.java} (100%)
 delete mode 100644 src/model/PaydayTile
 create mode 100644 src/model/PaydayTile.java
 create mode 100644 src/model/TileCircularLinkedList.java

diff --git a/bin/controller/Cashflow.class b/bin/controller/Cashflow.class
index 5362349525ab62564fc8621e03054d349a9ce788..d6dc11f8cec25c7b45e7e9d1c8bf37540b861076 100644
GIT binary patch
delta 771
zcma))O-~b16o%j18El!fq9ZMkP%|oxt&P+u5v2hmDio}O3Sz+zrtPIInXgQzB(AzQ
zZp=gz7k29!O<H3U*t_6g_%9mtOd)_fb2I0jIcLuEzH?_9!QUb2*Z$8P0At8+OENnx
z>t>N_sp(4TK3BEx36^G;OWa`y$LA8+O?696X{u35E#x<O!AbjZn?X95ao_puXaKVe
zq4`?XQ7qH4cyU6J5W!p!^LXg0z5%!68|mxM{v+d#3e)u$LFBN?5U5mFDu%&r1|gnU
z_2VT&-?8um+cxb0UNdYg8#b?++7>S=1yi>wn(9<cL$Pc#uW`Lf%DqeFN>$OhQ#Ol=
z?wPW=Q?m_4rKDQZ9L3yFoVONN^24U7an+D|J*rwLtHdB|kxLTR+>Y>moZW+n9y+T=
z8<AWKgV|&gLzBYPSKNq->o>)3h_-Pl7Z!gY)<RMqZQ@!o>h6d`lY56fd4?J^mT6*w
zx=l<qarb`+^}TIU7I22*bp$D%Lje5<Aq*J<v<7j9@>vX{fb%FrfsPCKNck7UaF!-A
z@KbCci$}Bv@ClEx0Qy|`fJHok4}G|Wr<4iAi{lw(B6znp;uZCy;t~Nu5ceVb5n(J9
zOA%+;UF^A7AMa`f=^k{+<kQ=qlV?u}<dV@M{VPqZeE!opelLj}0BLeLbAk~#WO$N-
rH_5#JgrWx<J19YFV=X7YYT?b*T`K#!=X9#8lR3eXj{K~5pHlw<u)>?w

delta 536
zcmYjNOD_Xa6#i~+Uq(xfcZ1AAXc0u3h_{e<7DcOyO_RCOMmy6?YhmRN*xi+lt+hx<
zNC-<CYd^rh5S-}<a&yl;kMBF@eD^(g5l~(}?;ZfeaB!ulEZ9&qbx{~v%UVaGa^1%!
zSWn3;G1Nt(ai=t&we$%e#u!5XvGUAi$r0XN*Z6~TT1dg?!dn4sBgx>;m(zK}5EcWE
zME88ykx#tIy~~i6Z@g=ATvKY2IiVFrC1>hdE?Z8UMkK1`%i6J_i^IGjbnVczv<iVL
zCncdJ3fU83DGE|@&VAN_XSm@ZIg9sb$=sqX-hYGkDL#FP5jpD#%Y9G#>FX5%I6`E*
z;3L}zKbjCkGgP$FX~Q)63kaiusxhY_#fudAF@q&6gAsllD_DgK^%zB*JWkwRtdZx&
zI$>+!`h@C33uA*s*g(Lh$xd%a>p-=&9fPh)E7)&BCcMq3o9AC2e=90902ro4$Nq8r
wKOB1ux4SU=hsg#h5pz;d?vcu<>04wTDeI~#_S#_5U@LRRE5GCSswlSq4SqgeEdT%j

diff --git a/src/controller/Cashflow.java b/src/controller/Cashflow.java
index 3b10d14..e014536 100644
--- a/src/controller/Cashflow.java
+++ b/src/controller/Cashflow.java
@@ -16,13 +16,24 @@ 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();
+		BigDealStack ms = new BigDealStack();
 		int initialSize = ms.getSize();
 		for(int i=0; i<initialSize; i++)
 		{
 			int num = i+1;
-			System.out.println(num + ": " + ((MarketCard) ms.pop()).getTitle()); //Always going to need this cast when getting description unfortunately
+			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
+		}
+		
+		
 	}
 	
 	public void go()
@@ -50,9 +61,11 @@ public void play()
 			// Check down sized (check if player's downsize counter is 0)
 			// Check charity (Check if charity counter is 0)
 			// Roll dice
-			// Move player
-			// Get card from tile ()
-			// 
+			// Move player (Have to wrap tiles to next tile after last tile is the beginning)
+			// Get card from tile (Method in tile to get card from its type or perform action for baby, down size, or charity)
+			// Perform card/tile action
+			// Update current/all players' financials
+			// Increment player array (Also needs to wrap like tiles array)
 		}
 	}
 	
diff --git a/src/model/CardStack.java b/src/model/CardStack.java
index 1148571..a66942c 100644
--- a/src/model/CardStack.java
+++ b/src/model/CardStack.java
@@ -30,8 +30,10 @@ public Card push(Card c)
 	@Override
 	public Card pop()
 	{
+		Card c = super.pop();
 		_size--;
-		return super.pop();
+		super.add(c);
+		return c;
 	}
 	
 	public Card pickCard()
diff --git a/src/model/CharityTile b/src/model/CharityTile
deleted file mode 100644
index 49797da..0000000
--- a/src/model/CharityTile
+++ /dev/null
@@ -1,10 +0,0 @@
-package model;
-
-public class CharityTile extends Tile {
-
-	public CharityTile(String type) {
-		super(type);
-		// TODO Auto-generated constructor stub
-	}
-
-}
diff --git a/src/model/CharityTile.java b/src/model/CharityTile.java
new file mode 100644
index 0000000..b076885
--- /dev/null
+++ b/src/model/CharityTile.java
@@ -0,0 +1,11 @@
+package model;
+
+public class CharityTile extends Tile
+{
+
+	public CharityTile(String type, int boardIndex)
+	{
+		super(type, boardIndex);
+		
+	}
+}
diff --git a/src/model/ChildTile b/src/model/ChildTile
deleted file mode 100644
index e6516ae..0000000
--- a/src/model/ChildTile
+++ /dev/null
@@ -1,10 +0,0 @@
-package model;
-
-public class ChildTile extends Tile {
-
-	public ChildTile(String type) {
-		super(type);
-		// TODO Auto-generated constructor stub
-	}
-
-}
diff --git a/src/model/ChildTile.java b/src/model/ChildTile.java
new file mode 100644
index 0000000..3ffe644
--- /dev/null
+++ b/src/model/ChildTile.java
@@ -0,0 +1,10 @@
+package model;
+
+public class ChildTile extends Tile
+{
+	public ChildTile(String type, int boardIndex)
+	{
+		super(type, boardIndex);
+		
+	}
+}
diff --git a/src/model/DealTile b/src/model/DealTile
deleted file mode 100644
index 3c64a5e..0000000
--- a/src/model/DealTile
+++ /dev/null
@@ -1,10 +0,0 @@
-package model;
-
-public class DealTile extends Tile {
-
-	public DealTile(String type) {
-		super(type);
-		// TODO Auto-generated constructor stub
-	}
-
-}
diff --git a/src/model/DealTile.java b/src/model/DealTile.java
new file mode 100644
index 0000000..0865435
--- /dev/null
+++ b/src/model/DealTile.java
@@ -0,0 +1,10 @@
+package model;
+
+public class DealTile extends Tile
+{
+	public DealTile(String type, int boardIndex)
+	{
+		super(type, boardIndex);
+		
+	}
+}
diff --git a/src/model/DoodadTile.java b/src/model/DoodadTile.java
new file mode 100644
index 0000000..ece68a2
--- /dev/null
+++ b/src/model/DoodadTile.java
@@ -0,0 +1,9 @@
+package model;
+
+public class DoodadTile extends Tile
+{
+	public DoodadTile(String name, int boardIndex)
+	{
+		super(name, boardIndex);
+	}
+}
diff --git a/src/model/GameBoard.java b/src/model/GameBoard.java
index 0a1f4e6..a744ef6 100644
--- a/src/model/GameBoard.java
+++ b/src/model/GameBoard.java
@@ -1,12 +1,25 @@
 package model;
 
+import java.util.LinkedList;
+import java.util.Queue;
+
 public class GameBoard
 {
-	private Tile[] _gameTiles;
+	private TileCircularLinkedList _tiles;
+	
+	private static Tile t1 = new DealTile("Deal Tile", 0);
+	private static Tile t2 = new DoodadTile("Doodad", 1);
+	private static Tile t3 = new DealTile("Deal", 2);
+	private static Tile t4 = new CharityTile("Charity", 3);
+	
 	
 	
+	public GameBoard()
+	{
+		_tiles = new TileCircularLinkedList();
+		_tiles.addTiles(t1, t2, t3, t4);
+	}
 	
 	
 	
-	// This class should have an array of tiles that goes back to the beginning when it reaches the end
 }
diff --git a/src/model/MarketStack.java b/src/model/MarketStack.java
index 3156675..6623e14 100644
--- a/src/model/MarketStack.java
+++ b/src/model/MarketStack.java
@@ -6,12 +6,12 @@
 public class MarketStack extends CardStack
 {
 	//Not sure how we're working in the descriptions as it's a more graphical concept but for now I'm going to type them out
-	private static MarketCard Profit1 = new MarketCard("Small Business Boom!",
-										"The downtown economy has exploded! EVERYONE is affected! ALL businesses with a cash flow of $1000 or less have their cash flow increased by $250", 
-										"profit", true, 250, "");
-	private static MarketCard Profit2 = new MarketCard("New Management System", 
-										"A new management system creates new efficiencies and lowers costs. Only the person who drew this MarketCard is affected.",
-										"profit", false, 400, "");
+	//private static MarketCard Profit1 = new MarketCard("Small Business Boom!",
+	//									"The downtown economy has exploded! EVERYONE is affected! ALL businesses with a cash flow of $1000 or less have their cash flow increased by $250", 
+	//									"profit", true, 250, "");
+	//private static MarketCard Profit2 = new MarketCard("New Management System", 
+	//									"A new management system creates new efficiencies and lowers costs. Only the person who drew this MarketCard is affected.",
+	//									"profit", false, 400, "");
 	
 	//gold MarketCard - value is $ per coin
 //	private static MarketCard Gold1 = new MarketCard("Price of Gold Soars", 
@@ -166,6 +166,7 @@ public MarketStack()
 	 *
 	 * 
 	 */
+	/*
 	public void Action(Player player){
 		currentcard = marketCardArray.pop();
 		currentcard.display(); //will be a method in MarketCard to display the GUI for the card
diff --git a/src/model/MarketTile b/src/model/MarketTile.java
similarity index 100%
rename from src/model/MarketTile
rename to src/model/MarketTile.java
diff --git a/src/model/PaydayTile b/src/model/PaydayTile
deleted file mode 100644
index 7a6bc5b..0000000
--- a/src/model/PaydayTile
+++ /dev/null
@@ -1,10 +0,0 @@
-package model;
-
-public class PaydayTile extends Tile {
-
-	public PaydayTile(String type) {
-		super(type);
-		// TODO Auto-generated constructor stub
-	}
-
-}
diff --git a/src/model/PaydayTile.java b/src/model/PaydayTile.java
new file mode 100644
index 0000000..e5a0c95
--- /dev/null
+++ b/src/model/PaydayTile.java
@@ -0,0 +1,10 @@
+package model;
+
+public class PaydayTile extends Tile
+{
+	public PaydayTile(String type, int boardIndex)
+	{
+		super(type, boardIndex);
+		
+	}
+}
diff --git a/src/model/Player.java b/src/model/Player.java
index 10ae45d..c8972bd 100644
--- a/src/model/Player.java
+++ b/src/model/Player.java
@@ -2,7 +2,7 @@
 
 public class Player
 {
-	public FinacialStatement _fs; //financial statement of user
+	public FinancialStatement _fs; //financial statement of user
 	//idNumber?
 //	public boolean _charity;
 	private int _CharityCount; //charity counter
diff --git a/src/model/Tile.java b/src/model/Tile.java
index a4b69d1..acce69a 100644
--- a/src/model/Tile.java
+++ b/src/model/Tile.java
@@ -2,13 +2,25 @@
 
 public class Tile
 {
-	private String _type;
+	private String _name;
+	private int _boardIndex;
+	private Player[] _players;
 	
-	public Tile(String type)
+	public Tile(String name, int boardIndex)
 	{
-		_type = type;
+		_name = name;
+		_boardIndex = boardIndex;
 	}
 	
+	public int getBoardIndex()
+	{
+		return _boardIndex;
+	}
+
+	public String getName()
+	{
+		return _name;
+	}
 	
 	
 }
diff --git a/src/model/TileCircularLinkedList.java b/src/model/TileCircularLinkedList.java
new file mode 100644
index 0000000..6935b42
--- /dev/null
+++ b/src/model/TileCircularLinkedList.java
@@ -0,0 +1,116 @@
+package model;
+
+public class TileCircularLinkedList
+{
+	class Node {
+	    Tile t;
+	    Node next;
+	    public Node(Tile tile) {
+	        this.t = tile;
+	    }
+	    public Node getNext() {
+	    	return next;
+	    }
+		public Tile getData() {
+			return t;
+		}
+	}
+	
+    public int size =0;
+    public Node head=null;
+    public Node tail=null;
+
+    //add a new node at the start of the linked list
+    public void addNodeAtStart(Tile tile){
+        Node n = new Node(tile);
+        if(size==0){
+            head = n;
+            tail = n;
+            n.next = head;
+        }else{
+            Node temp = head;
+            n.next = temp;
+            head = n;
+            tail.next = head;
+        }
+        size++;
+    }
+
+    
+    public void addNodeAtEnd(Tile tile){
+        if(size==0){
+            addNodeAtStart(tile);
+        }else{
+            Node n = new Node(tile);
+            tail.next =n;
+            tail=n;
+            tail.next = head;
+            size++;
+        }
+    }
+
+    public void deleteNodeFromStart(){
+        if(size==0){
+            System.out.println("List is Empty");
+        }else{
+            head = head.next;
+            tail.next=head;
+            size--;
+        }
+    }
+
+    public Node get(int index){
+        if(index>size){
+            return  null;
+        }
+        Node n = head;
+        while(index-1!=0){
+            n=n.next;
+            index--;
+        }
+        return n;
+    }
+    
+    public Tile elementAt(int index){
+        if(index>size){
+            return null;
+        }
+        Node n = head;
+        while(index-1!=0){
+            n=n.next;
+            index--;
+        }
+        return n.t;
+    }
+
+    //print the linked list
+    public void print(){
+        Node temp = head;
+        if(size<=0){
+            System.out.print("List is empty");
+        }else{
+            do {
+                System.out.print(" " + temp.t.getName());
+                temp = temp.next;
+            }
+            while(temp!=head);
+        }
+        System.out.println();
+    }
+
+    //get Size
+    public int getSize(){
+        return size;
+    }
+
+
+	public void addTiles(Tile... tiles)
+	{
+		for(Tile t : tiles)
+		{
+			this.addNodeAtEnd(t);
+		}
+		
+	}
+	
+}