Merge branch 'master' of

https://github.uconn.edu/joh13010/2102-Group-Project-Spring-2017.git Conflicts: bin/controller/Cashflow.class src/view/MainMenu.java
joh13010 · Apr 23, 2017 · 62350f3 · 62350f3
2 parents 3ef3b3e + 454e127
commit 62350f3
Show file tree

Hide file tree

Showing 33 changed files with 307 additions and 270 deletions.
diff --git a/bin/controller/Cashflow.class b/bin/controller/Cashflow.class
diff --git a/bin/model/CardStack.class b/bin/model/CardStack.class
diff --git a/bin/model/CharityTile.class b/bin/model/CharityTile.class
diff --git a/bin/model/ChildTile.class b/bin/model/ChildTile.class
diff --git a/bin/model/DealTile.class b/bin/model/DealTile.class
diff --git a/bin/model/DoodadTile.class b/bin/model/DoodadTile.class
diff --git a/bin/model/FinancialStatement.class b/bin/model/FinancialStatement.class
diff --git a/bin/model/GameBoard.class b/bin/model/GameBoard.class
diff --git a/bin/model/PaydayTile.class b/bin/model/PaydayTile.class
diff --git a/bin/model/Player.class b/bin/model/Player.class
diff --git a/bin/model/Tile.class b/bin/model/Tile.class
diff --git a/bin/model/TileCircularLinkedList$Node.class b/bin/model/TileCircularLinkedList$Node.class
diff --git a/bin/model/TileCircularLinkedList.class b/bin/model/TileCircularLinkedList.class
diff --git a/bin/view/DealCardWindow$1.class b/bin/view/DealCardWindow$1.class
diff --git a/bin/view/DealCardWindow$2.class b/bin/view/DealCardWindow$2.class
diff --git a/bin/view/DealCardWindow$3$1.class b/bin/view/DealCardWindow$3$1.class
diff --git a/bin/view/DealCardWindow$3$2.class b/bin/view/DealCardWindow$3$2.class
diff --git a/bin/view/DealCardWindow$3.class b/bin/view/DealCardWindow$3.class
diff --git a/bin/view/DealCardWindow$4$1.class b/bin/view/DealCardWindow$4$1.class
diff --git a/bin/view/DealCardWindow$4$2.class b/bin/view/DealCardWindow$4$2.class
diff --git a/bin/view/DealCardWindow$4.class b/bin/view/DealCardWindow$4.class
diff --git a/bin/view/DealCardWindow.class b/bin/view/DealCardWindow.class
diff --git a/bin/view/DoodadCardWindow$1.class b/bin/view/DoodadCardWindow$1.class
diff --git a/bin/view/DoodadCardWindow$2.class b/bin/view/DoodadCardWindow$2.class
diff --git a/bin/view/DoodadCardWindow.class b/bin/view/DoodadCardWindow.class
diff --git a/bin/view/FSWindow.class b/bin/view/FSWindow.class
diff --git a/bin/view/MainWindow$1.class b/bin/view/MainWindow$1.class
diff --git a/bin/view/MainWindow.class b/bin/view/MainWindow.class
diff --git a/src/controller/Cashflow.java b/src/controller/Cashflow.java
@@ -12,16 +12,27 @@ public class Cashflow
 	public GameboardWindow gameboard;
 	public static int numPlayers;
 
-
+	public static void main(String[] args)
+	{
+		go();
+	}
 
 	public static void go()
 	{
-		System.out.println("Start game");
 		// Joe
 		// Initialize players (pick professions)
+		MainMenu mm = new MainMenu();
+		String[] names = mm.makeMainMenu();
+		ArrayList<Player> players = new ArrayList<Player>();
+		for(String name : names)
+		{
+			players.add(new Player(name));
+		}
 
 		// Initialize game board
-		_board = new GameBoard();
+		_board = new GameBoard(players);
+
+		System.out.println("hello");
 		// Initialize GUI
 
 

diff --git a/src/model/GameBoard.java b/src/model/GameBoard.java
@@ -37,7 +37,7 @@ public class GameBoard
 	private static Tile t24 = new DoodadTile("Doodad Tile", 23);
 
 
-	public GameBoard(Player... players)
+	public GameBoard(ArrayList<Player> players)
 	{
 		_profs = new Professions();
 		_tiles = new TileCircularLinkedList();

diff --git a/src/model/Player.java b/src/model/Player.java
@@ -7,11 +7,14 @@ public class Player
 	private int _charityCount; //charity counter
 	private int _downsizeCount; //down size counter
 	private int _location;//refers to a tile number
+	private String _name;
 	private boolean _hasWon;
+	private String _playerName;
 
-	public Player()
+	public Player(String name)
 	{
 		Professions p = new Professions();
+		_name = name;
 		_fs = new FinancialStatement(p.getProfession());
 		_charityCount = 0;
 		_downsizeCount = 0;
@@ -80,7 +83,24 @@ public class Player
 		_downsizeCount--;
 	}
 
+	public void setPlayerName(String playerName)
+	{
+		_playerName = playerName;
+	}
 
-
+	public String getPlayerName()
+	{
+		return _playerName;
+	}
+
+
+	public String getName() {
+		return _name;
+	}
+
+
+	public void setName(String _name) {
+		this._name = _name;
+	}
 
 }
diff --git a/src/model/Tile.java b/src/model/Tile.java
@@ -27,7 +27,7 @@ public class Tile
 
 	public void getLandedOn(Player p) {}
 
-	public void addPlayers(Player... players)
+	public void addPlayers(ArrayList<Player> players)
 	{
 		for(Player p : players)
 		{