Merge branch 'master' into KnightImplementation_2

Conflicts:
	src/GameController.cpp

Author: PickledMonkey

include/GameBoard.h

@@ -79,6 +79,8 @@ class GameBoard {
 
 	void initializeGame();
 
+	GameDice getDice();
+
 	void save(std::ostream& out);
 
 	void buyCard(Player& owner);

include/GameController.h

@@ -68,6 +68,8 @@ class GameController {
 	bool hasClickHistory();
 	int getClickHistorySize();
 
+	void robPlayers();
+
 	bool handlePlayerClick(ScreenCoordinate, Player&);
 	bool handleTradeOffer(ScreenCoordinate, Player& initiating, std::array<int, 5>, Player& receiving, std::array<int, 5>);
 };

resources/catan_sprite_sheet.bmp

@@ -65,6 +65,8 @@ GameBoard::GameBoard(const vector<std::string>& playerNames) {
 		}
 		valid = isValidBoard();
 	}
+	moveRobber(Coordinate(0,4));
+
 }
 
 /**
@@ -126,6 +128,9 @@ GameBoard::GameBoard(const std::vector<std::string>& playerNames, const std::map
 	currentTurn = 0;
 }
 
+GameDice GameBoard::getDice() {
+	return dice;
+}
 /**
  * Construct a board by reading in an XML representation from a stream.
  * @param in The stream to read from.

src/GameBoard.cpp

@@ -149,6 +149,9 @@ void printPlayerInfo(const Player& player) {
  */
 bool GameController::nextTurn(ScreenCoordinate) {
 	model.endTurn();
+	if (model.getDice().getFirst() + model.getDice().getSecond() == 7)
+		pushState(ROBBER);
+
 	printPlayerInfo(model.getCurrentPlayer());
 	return true;
 }
@@ -163,6 +166,8 @@ bool GameController::nextTurn(ScreenCoordinate) {
 bool GameController::handleBoardEvent(ScreenCoordinate screenCoord) {
 	printPlayerInfo(model.getCurrentPlayer());
 	auto coord = screenToCoord(screenCoord);
+	std::vector<Settlement*> neighbors;
+	int resourceToSteal;	
 
 	switch (getState()){
 	case BUILDROAD:
@@ -178,6 +183,19 @@ bool GameController::handleBoardEvent(ScreenCoordinate screenCoord) {
 		break;
 	case ROBBER:
 		//model.moveRobber(coord);
+		robPlayers();
+
+		if(!hasClickHistory())
+			storeClick(coord);
+		
+		model.moveRobber(coord);
+		neighbors = model.GetNeighboringSettlements(coord);
+		if (!neighbors.empty()) {
+			resourceToSteal = neighbors[0]->getOwner().getRandomResource();
+			neighbors[0]->getOwner().addResource(resourceToSteal, -1);
+			model.getCurrentPlayer().addResource(resourceToSteal, 1);
+			} 
+
 		popState();
 		break;
 	case BUILDROAD_DEVCARD:
@@ -194,6 +212,26 @@ bool GameController::handleBoardEvent(ScreenCoordinate screenCoord) {
 	case KNIGHT_DEVCARD:
 		storeClick(coord);
 		view.setControlStateText("Select a player around that tile to steal from (Select yourself if you don't want to rob anyone)");
+		//model.getCurrentPlayer().playKnight(coord, opponent);
+		/**if(!hasClickHistory())
+			storeClick(coord);
+		
+		model.moveRobber(coord);
+		neighbors = model.GetNeighboringSettlements(coord);
+		if (!neighbors.empty()) {
+			resourceToSteal = neighbors[0]->getOwner().getRandomResource();
+			neighbors[0]->getOwner().addResource(resourceToSteal, -1);
+			model.getCurrentPlayer().addResource(resourceToSteal, 1);
+			} 
+
+		//TODO Decrement knight count
+
+
+		
+		popState();**/
+		break;
+	case YEAROFPLENTY_DEVCARD:
+		model.getCurrentPlayer().playYearOfPlenty(model.getResourceTile(coord).getType());
 		popState();
 		break;
 	case VICTORYPOINT_DEVCARD:
@@ -216,6 +254,26 @@ bool GameController::handleBoardEvent(ScreenCoordinate screenCoord) {
 	return true;
 }
 
+void GameController :: robPlayers() {
+	for (int i = 0; i < model.getNoOfPlayers(); i++) {
+		int resources[5];
+		model.getPlayer(i).checkResources(resources);
+		//int rSum = resources[0] + resources[1] + resources[2] + resources[3] + resources[4];
+		int rSum = model.getPlayer(i).getWood() + 
+		model.getPlayer(i).getOre() + 
+		model.getPlayer(i).getBrick() + 
+		model.getPlayer(i).getWheat() + 
+		model.getPlayer(i).getWool(); 
+
+		if (rSum > 7) {
+			for (int j = 0 ; j < rSum/2; j++) {
+				model.getPlayer(i).addResource(model.getPlayer(i).getRandomResource(), -1);
+
+			}
+		}
+	}
+}
+
 /**
  * Handles the event when the cancel button in the top right corner of the screen is pressed. This will
  * reset the control state back to the base state.

src/GameController.cpp

@@ -116,12 +116,22 @@ void ResourceTile::Payout() const{
 	if (getBoard().getRobber() == location) //no need to pay out
 		return;
 
-	std::vector<CornerPiece*> neighbors = getBoard().GetNeighboringCorners(location);
-	std::vector<CornerPiece*>::iterator it = neighbors.begin();
+	//std::vector<CornerPiece*> neighbors = getBoard().GetNeighboringCorners(location);
+	//std::vector<CornerPiece*>::iterator it = neighbors.begin();
+
+	std::vector<Settlement*> neighbors = getBoard().GetNeighboringSettlements(location);
+	std::vector<Settlement*>::iterator it = neighbors.begin();
 	while (it != neighbors.end())
 	{
 		(*it)->getOwner().addResource(resource, (*it)->getResourceModifier());
+		/*std::cout << ((*it)->getOwner().getWood()) << "\n";
+		std::cout << ((*it)->getOwner().getBrick()) << "\n";
+		std::cout << ((*it)->getOwner().getOre()) << "\n";
+		std::cout << ((*it)->getOwner().getWheat()) << "\n";
+		std::cout << ((*it)->getOwner().getWool()) << "\n";*/
+
 		it++;
 	}
+
 }