asdf

joh13010 · Apr 23, 2017 · 32004f1 · 32004f1
1 parent 7e4dc47
commit 32004f1
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 36 deletions.
diff --git a/bin/controller/Cashflow.class b/bin/controller/Cashflow.class
diff --git a/bin/model/GameBoard.class b/bin/model/GameBoard.class
diff --git a/bin/model/Tile.class b/bin/model/Tile.class
diff --git a/bin/view/GameboardWindow.class b/bin/view/GameboardWindow.class
diff --git a/bin/view/TileButton.class b/bin/view/TileButton.class
diff --git a/src/controller/Cashflow.java b/src/controller/Cashflow.java
@@ -3,23 +3,25 @@ package controller;
 import view.*;
 
 import java.util.ArrayList;
-import java.awt.*;
-import java.swing.*;
 
+import javax.swing.*;
+
+import java.awt.*;
 import model.*;
 
 public class Cashflow
 {
 	private static GameBoard _board;
 	public GameboardWindow gameboard;
+	public static ArrayList<Player> _players;
 	public static int numPlayers;
 	private JFrame frame;
 	private JWindow sidewindow;
 	private GameboardWindow window;
 
 	public static void main(String[] args)
 	{
-		go();
+		testGamePlay();
 	}
 
 	public static void go()
@@ -28,16 +30,16 @@ public class Cashflow
 		// Initialize players (pick professions)
 		MainMenu mm = new MainMenu();
 		String[] names = mm.makeMainMenu();
-		ArrayList<Player> players = new ArrayList<Player>();
+		_players = new ArrayList<Player>();
 		for(String name : names)
 		{
-			players.add(new Player(name));
+			_players.add(new Player(name));
 		}
 
 		// Initialize game board
-		_board = new GameBoard(players);
+		_board = new GameBoard(_players);
+
 
-		System.out.println("hello");
 		// Initialize GUI
 
 
@@ -85,9 +87,13 @@ public class Cashflow
 
 	private static void testGamePlay()
 	{
-		Player p1 = new Player();
+
-		Player p2 = new Player();
+		Player p1 = new Player("1");
-		GameBoard g = new GameBoard(p1, p2);
+		Player p2 = new Player("2");
+		ArrayList<Player> players = new ArrayList<Player>();
+		players.add(p1);
+		players.add(p2);
+		GameBoard g = new GameBoard(players);
 		System.out.println(p1.getLocation());
 		g.movePlayer(p1, 5);
 		System.out.println(p1.getLocation());
@@ -137,31 +143,36 @@ public class Cashflow
 
 
 	}
-		public void setUpScreen() {
+
-		frame = new JFrame("Cashflow");
+
-		frame.setLayout(new FlowLayout());
+//	
-		window = new GameboardWindow(_board);
+//		public void setUpScreen() 
-
+//		{
-		sidewindow = new JWindow();
+//		frame = new JFrame("Cashflow");
-		sidewindow.setLayout(new GridLayout(5, 5));
+//		frame.setLayout(new FlowLayout());
-
+//		window = new GameboardWindow(_board);
-		frame.add(window);
+//
-
+//		sidewindow = new JWindow();
-
+//		sidewindow.setLayout(new GridLayout(5, 5));
-		frame.pack();
+//
-
+//		frame.add(window);
-		frame.setVisible(true);
+//
-		frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+//
-	}
+//		frame.pack();
-	public static void main(String[] args) {
+//
-		new Cashflow(4);
+//		frame.setVisible(true);
-
+//		frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-	}
+//	}
-	public Cashflow(int numPlayers)
+//	public static void main(String[] args) {
-	{
+//		new Cashflow(4);
-		//this.setUpScreen(); // just did this to test the screen
+//
-
+//	}
-	}
+//	public Cashflow(int numPlayers)
+//	{
+//		//this.setUpScreen(); // just did this to test the screen
+//		
+//	}
+
 
 }
 

diff --git a/src/model/GameBoard.java b/src/model/GameBoard.java
@@ -73,7 +73,7 @@ public class GameBoard
 
 			currentNode = nextNode;
 		}
-		currentNode.getData().addPlayers(p);
+		currentNode.getData().addPlayer(p);
 		p.setLocation(currentNode.getData().getBoardIndex());
 		currentNode.getData().getLandedOn(p);
 		return passedPaydays;

diff --git a/src/model/Tile.java b/src/model/Tile.java
@@ -39,5 +39,10 @@ public class Tile
 	{
 		_players.remove(p);
 	}
+
+	public void addPlayer(Player p)
+	{
+		_players.add(p);
+	}
 
 }