Skip to content
Permalink
Browse files

Merge branch 'master' of

https://github.uconn.edu/joh13010/2102-Group-Project-Spring-2017.git

Conflicts:
	bin/controller/Cashflow.class
	src/view/MainMenu.java
  • Loading branch information
Joe Hill
Joe Hill committed Apr 23, 2017
2 parents 3ef3b3e + 454e127 commit 62350f37c56bcae3b6305b54eda1fe5a4b2d59af
BIN +156 Bytes (110%) bin/controller/Cashflow.class
Binary file not shown.
BIN +0 Bytes (100%) bin/model/CardStack.class
Binary file not shown.
BIN +83 Bytes (110%) bin/model/CharityTile.class
Binary file not shown.
BIN -24 Bytes (96%) bin/model/ChildTile.class
Binary file not shown.
BIN +291 Bytes (120%) bin/model/DealTile.class
Binary file not shown.
BIN +439 Bytes (150%) bin/model/DoodadTile.class
Binary file not shown.
Binary file not shown.
BIN -762 Bytes (80%) bin/model/GameBoard.class
Binary file not shown.
BIN +0 Bytes (100%) bin/model/PaydayTile.class
Binary file not shown.
BIN +295 Bytes (110%) bin/model/Player.class
Binary file not shown.
BIN +232 Bytes (120%) bin/model/Tile.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN +0 Bytes (100%) bin/view/DealCardWindow$1.class
Binary file not shown.
BIN +0 Bytes (100%) bin/view/DealCardWindow$2.class
Binary file not shown.
BIN +0 Bytes (100%) bin/view/DealCardWindow$3$1.class
Binary file not shown.
BIN +0 Bytes (100%) bin/view/DealCardWindow$3$2.class
Binary file not shown.
BIN +0 Bytes (100%) bin/view/DealCardWindow$3.class
Binary file not shown.
BIN +0 Bytes (100%) bin/view/DealCardWindow$4$1.class
Binary file not shown.
BIN +0 Bytes (100%) bin/view/DealCardWindow$4$2.class
Binary file not shown.
BIN +0 Bytes (100%) bin/view/DealCardWindow$4.class
Binary file not shown.
BIN +0 Bytes (100%) bin/view/DealCardWindow.class
Binary file not shown.
BIN +0 Bytes (100%) bin/view/DoodadCardWindow$1.class
Binary file not shown.
BIN +0 Bytes (100%) bin/view/DoodadCardWindow$2.class
Binary file not shown.
BIN +0 Bytes (100%) bin/view/DoodadCardWindow.class
Binary file not shown.
BIN +6.45 KB (560%) bin/view/FSWindow.class
Binary file not shown.
BIN +0 Bytes (100%) bin/view/MainWindow$1.class
Binary file not shown.
BIN +0 Bytes (100%) bin/view/MainWindow.class
Binary file not shown.
@@ -12,16 +12,27 @@
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


@@ -37,7 +37,7 @@
private static Tile t24 = new DoodadTile("Doodad Tile", 23);


public GameBoard(Player... players)
public GameBoard(ArrayList<Player> players)
{
_profs = new Professions();
_tiles = new TileCircularLinkedList();
@@ -7,11 +7,14 @@
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 void decrememntDownsizeCount()
_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;
}

}
@@ -27,7 +27,7 @@ public String getName()

public void getLandedOn(Player p) {}

public void addPlayers(Player... players)
public void addPlayers(ArrayList<Player> players)
{
for(Player p : players)
{

0 comments on commit 62350f3

Please sign in to comment.
You can’t perform that action at this time.