Got some straight up Knight action in here. Also rearranged some things

and made some descriptive state UI stuff

Author: PickledMonkey

include/GameBoard.h

@@ -135,7 +135,7 @@ class GameBoard {
 
     bool testRollChecking(int* rolls);
 
-    void moveRobber(Coordinate newRobber);
+    bool moveRobber(Coordinate newRobber);
     Coordinate getRobber() const;
     bool canRobberRob(Player& opponent, Coordinate location);
 

include/GameController.h

@@ -47,6 +47,12 @@ class GameController {
 	bool handleMonopolyCardButtonEvent(ScreenCoordinate);
 	bool handleVictoryPointCardButtonEvent(ScreenCoordinate);
 
+	bool handleWoodButtonEvent(ScreenCoordinate);
+	bool handleSheepButtonEvent(ScreenCoordinate);
+	bool handleWheatButtonEvent(ScreenCoordinate);
+	bool handleOreButtonEvent(ScreenCoordinate);
+	bool handleBrickButtonEvent(ScreenCoordinate);
+
 	bool handleCancelButtonEvent(ScreenCoordinate);
 
 	bool handleConfirmRoadCard(ScreenCoordinate);

include/GameView.h

@@ -55,6 +55,8 @@ class GameView {
 	void drawCardCount(std::string font, int fontSize);
 	void drawResourceCount(std::string font, int fontSize);
 
+	std::string controlStateText;
+
 	GameView(const GameView& o) = delete;
 	GameView& operator=(const GameView& o) = delete;
 public:
@@ -64,6 +66,8 @@ class GameView {
 	void render();
 	bool acceptInput(SDL_Event& event);
 
+	void setControlStateText(std::string newText);
+
 
 	void addPointOfInterest(ScreenCoordinate);
 	void clearPointsOfInterest();

src/GameBoard.cpp

@@ -399,16 +399,15 @@ std::vector<Settlement*> GameBoard::GetNeighboringSettlements(
  * @param location The location to search the neighbors of.
  * @return A vector of the corner pieces in the vicinity.
  */
-std::vector<CornerPiece*> GameBoard::GetNeighboringCorners(
-		Coordinate location) const{
-	static Coordinate adjacentCoordDiffs[] = { Coordinate(0, 1), Coordinate(1,
-			0), Coordinate(1, -1), Coordinate(0, -1), Coordinate(-1, 0),
-			Coordinate(-1, 1) };
+std::vector<CornerPiece*> GameBoard::GetNeighboringCorners(Coordinate location) const{
+	static Coordinate adjacentCoordDiffs[] = { Coordinate(0, 1), Coordinate(1,0),
+			Coordinate(1, -1), Coordinate(0, -1), Coordinate(-1, 0), Coordinate(-1, 1) };
+
 	std::vector<CornerPiece*> v;
 	for (unsigned int i = 0; i < 6; i++) {
 		const Coordinate& diff = adjacentCoordDiffs[i];
-		Coordinate adjacentPoint(location.first + diff.first,
-				location.second + diff.second);
+		Coordinate adjacentPoint(location.first + diff.first, location.second + diff.second);
+
 		auto it = corners.find(adjacentPoint);
 		if (it != corners.end()) {
 			GamePiece* piece = it->second.get();
@@ -516,21 +515,22 @@ bool GameBoard::verifyRoadPlacement(Coordinate start, Coordinate end, Player& Ow
  * Move the robber to a new coordinate on the board.
  * @param newRobber The coordinate to move the robber to.
  */
-void GameBoard::moveRobber(Coordinate newRobber) {
+bool GameBoard::moveRobber(Coordinate newRobber) {
 
 	//Bounds check
-	if(resources.count(newRobber) > 0)
+	if(resources.find(newRobber) != resources.end()){
 		robber = newRobber;
+		return true;
+	}
+	return false;
 }
 
 /**
- * DOES NOT WORK BECAUSE getNeighboringCorners() does not work
+ * Returns whether the robber can rob the Player opponent at the recourse tile Coordinate location
+ * @return true if the robber can rob the opponent, false otherwise
  */
 bool GameBoard::canRobberRob(Player& opponent, Coordinate location){
-	std::cout << GetNeighboringCorners(location).size() << "\n";
-
 	for(auto corner : GetNeighboringCorners(location)){
-		std::cout << corner->getOwner().getName() << "derp\n";
 		if(corner->getOwner() == opponent){
 			return true;
 		}

src/GameController.cpp

@@ -23,10 +23,10 @@ GameController::GameController(GameBoard& model, GameView& view) : model(model),
 	auto font = getGraphicsConfig()["font.path"];
 	auto fontSize = getGraphicsConfig()["font.size"];
 
-	view.addElement(makeViewButtonText(std::bind(&GameController::handleRoadButtonEvent, this, _1), {{0, 0}, {0.1, 0.1}}, font, fontSize, "Road"));
-	view.addElement(makeViewButtonText(std::bind(&GameController::handleSettlementButtonEvent, this, _1), {{0, 0.1}, {0.1, 0.2}}, font, fontSize, "Stlm"));
-	view.addElement(makeViewButtonText(std::bind(&GameController::handleCityButtonEvent, this, _1), {{0, 0.2}, {0.1, 0.3}}, font, fontSize, "City"));
-	view.addElement(makeViewButtonText(std::bind(&GameController::nextTurn, this, _1), {{0, 0.3}, {0.1, 0.4}}, font, fontSize, "Turn"));
+	view.addElement(makeViewButtonText(std::bind(&GameController::handleRoadButtonEvent, this, _1), {{0, 0}, {0.1, 0.10}}, font, fontSize, "Road |"));
+	view.addElement(makeViewButtonText(std::bind(&GameController::handleCityButtonEvent, this, _1), {{0.10, 0.0}, {0.20, 0.1}}, font, fontSize, "City |"));
+	view.addElement(makeViewButtonText(std::bind(&GameController::handleSettlementButtonEvent, this, _1), {{0.20, 0.0}, {0.33, 0.1}}, font, fontSize, "Settlement"));
+	view.addElement(makeViewButtonText(std::bind(&GameController::nextTurn, this, _1), {{0, 0.3}, {0.1, 0.4}}, font, fontSize, "End Turn"));
 
 	auto playerTopY = 0.9;
 	for(auto i = 0; i < model.getNoOfPlayers(); i++) {
@@ -36,7 +36,7 @@ GameController::GameController(GameBoard& model, GameView& view) : model(model),
 		playerTopY -= 0.05;
 	}
 
-	view.addElement(makeViewButtonColor(std::bind(&GameController::handleCancelButtonEvent, this, _1), {{.95, .95}, {1.0, 1.0}}, std::make_tuple(1.f, 0.0f, 0.f)));
+	view.addElement(makeViewButtonText(std::bind(&GameController::handleCancelButtonEvent, this, _1), {{.92, .96}, {1.0, 1.0}}, font, fontSize, "Cancel"));
 
 	view.addElement(makeViewButtonText(std::bind(&GameController::handleBuyDevelopmentCardButtonEvent, this, _1), {{.85, .23}, {1, .30}}, font, fontSize, "Development Cards"));
 	view.addElement(makeViewButtonText(std::bind(&GameController::handleRoadCardButtonEvent, this, _1), {{0.85, 0.0}, {0.97, 0.05}}, font, fontSize, "Road Building "));
@@ -45,6 +45,11 @@ GameController::GameController(GameBoard& model, GameView& view) : model(model),
 	view.addElement(makeViewButtonText(std::bind(&GameController::handleMonopolyCardButtonEvent, this, _1), {{0.85, 0.15}, {0.97, 0.20}},  font, fontSize, "Monopoly "));
 	view.addElement(makeViewButtonText(std::bind(&GameController::handleVictoryPointCardButtonEvent, this, _1), {{0.85, 0.20}, {0.97, 0.25}},  font, fontSize, "Victory Point "));
 
+	view.addElement(makeViewButtonText(std::bind(&GameController::handleWoodButtonEvent, this, _1), {{.85, .35}, {.97, .40}}, font, fontSize, "Wood "));
+	view.addElement(makeViewButtonText(std::bind(&GameController::handleSheepButtonEvent, this, _1), {{.85, .40}, {.97, .45}}, font, fontSize, "Sheep "));
+	view.addElement(makeViewButtonText(std::bind(&GameController::handleOreButtonEvent, this, _1), {{.85, .45}, {.97, .50}}, font, fontSize, "Ore "));
+	view.addElement(makeViewButtonText(std::bind(&GameController::handleBrickButtonEvent, this, _1), {{.85, .50}, {.97, .55}}, font, fontSize, "Brick "));
+	view.addElement(makeViewButtonText(std::bind(&GameController::handleWheatButtonEvent, this, _1), {{.85, .55}, {.97, .60}}, font, fontSize, "Wheat "));
 
 
 	stateStack.push_back(BASESTATE);
@@ -149,6 +154,7 @@ bool GameController::nextTurn(ScreenCoordinate) {
 }
 
 
+
 /**
  * Handles a click that is actually on the tiles of the board. Either constructs a road or a settlement based on the control buttons the user has clicked.
  * @param screenCoord Where the user clicked on screen.
@@ -165,7 +171,7 @@ bool GameController::handleBoardEvent(ScreenCoordinate screenCoord) {
 		} else {
 			if (model.buyRoad(getLastClick(), coord, model.getCurrentPlayer()));
 			{
-				popState();
+				handleCancelButtonEvent(screenCoord);
 			}
 			clearClickHistory();
 		}
@@ -186,30 +192,23 @@ bool GameController::handleBoardEvent(ScreenCoordinate screenCoord) {
 		}
 		break;
 	case KNIGHT_DEVCARD:
-		//model.getCurrentPlayer().playKnight(coord, opponent);
-		popState();
-		break;
-	case YEAROFPLENTY_DEVCARD:
-		model.getCurrentPlayer().playYearOfPlenty(model.getResourceTile(coord).getType());
-		popState();
-		break;
-	case MONOPOLY_DEVCARD:
-		model.getCurrentPlayer().playYearOfPlenty(model.getResourceTile(coord).getType());
+		storeClick(coord);
+		view.setControlStateText("Select a player around that tile to steal from (Select yourself if you don't want to rob anyone)");
 		popState();
 		break;
 	case VICTORYPOINT_DEVCARD:
 		model.getCurrentPlayer().playVictoryCard();
-		popState();
+		handleCancelButtonEvent(screenCoord);
 		break;
 	case BUILDSETTLEMENT:
 		std::cout << "attempting to buy a settlement" << std::endl;
 		model.buySettlement(coord, model.getCurrentPlayer());
-		popState();
+		handleCancelButtonEvent(screenCoord);
 		break;
 	case BUILDCITY:
 		std::cout << "attempting to build a city" << std::endl;
 		model.buyUpgradeOnSettlement(coord, model.getCurrentPlayer());
-		popState();
+		handleCancelButtonEvent(screenCoord);
 		break;
 	default:
 		break;
@@ -225,6 +224,7 @@ bool GameController::handleCancelButtonEvent(ScreenCoordinate){
 	while(getState() != BASESTATE){
 		popState();
 	}
+	view.setControlStateText(" ");
 	clearClickHistory();
 	return true;
 }
@@ -238,8 +238,9 @@ bool GameController::handleCancelButtonEvent(ScreenCoordinate){
 bool GameController::handleRoadButtonEvent(ScreenCoordinate coord) {
 	clearClickHistory();
 	if(getState() != BASESTATE){
-		return true;
+		return false;
 	}
+	view.setControlStateText("Click two adjacent corner points to place a road. (1Br and 1Wd)");
 	pushState(BUILDROAD);
 	return true;
 }
@@ -251,8 +252,9 @@ bool GameController::handleRoadButtonEvent(ScreenCoordinate coord) {
  */
 bool GameController::handleSettlementButtonEvent(ScreenCoordinate coord) {
 	if(getState() != BASESTATE){
-		return true;
+		return false;
 	}
+	view.setControlStateText("Click on a corner tile to build a settlement there. (1Br, 1Wh, 1Wd, and 1Sh)");
 	pushState(BUILDSETTLEMENT);
 	return true;
 }
@@ -263,9 +265,12 @@ bool GameController::handleSettlementButtonEvent(ScreenCoordinate coord) {
  * @return Whether this event was handled by this element. Always true.
  */
 bool GameController::handleCityButtonEvent(ScreenCoordinate coord) {
-	if(getState() == BASESTATE) {
-		pushState(BUILDCITY);
+	if(getState() != BASESTATE) {
+		return false;
 	}
+
+	view.setControlStateText("Click on a settlement to upgrade it to a city. (3Wh and 2Ore)");
+	pushState(BUILDCITY);
 	return true;
 }
 
@@ -280,6 +285,8 @@ bool GameController::handleRoadCardButtonEvent(ScreenCoordinate coord){
 		return true;
 	}
 	clearClickHistory();
+
+	view.setControlStateText("Playing Road Building Card: Click on adjacent points for the roads you want.");
 	pushState(BUILDROAD_DEVCARD);
 	return true;
 }
@@ -320,6 +327,8 @@ bool GameController::handleKnightCardButtonEvent(ScreenCoordinate coord){
 	if(getState() != BASESTATE){
 		return true;
 	}
+
+	view.setControlStateText("Select a tile that you want to place the robber on");
 	pushState(KNIGHT_DEVCARD);
 	return true;
 }
@@ -333,6 +342,8 @@ bool GameController::handleYearOfPlentyCardButtonEvent(ScreenCoordinate coord){
 	if(getState() != BASESTATE){
 		return true;
 	}
+
+	view.setControlStateText("Playing Year of Plenty Card: Click on the resource you want on the side of the screen");
 	pushState(YEAROFPLENTY_DEVCARD);
 	return true;
 }
@@ -346,6 +357,7 @@ bool GameController::handleMonopolyCardButtonEvent(ScreenCoordinate coord){
 	if(getState() != BASESTATE){
 		return true;
 	}
+	view.setControlStateText("Playing Monopoly Card: Click on the resource you want on the side of the screen");
 	pushState(MONOPOLY_DEVCARD);
 	return true;
 }
@@ -378,28 +390,33 @@ auto negativeArr(std::array<int, size> arr) -> std::array<int, size> {
  * @param player The player whose name was clicked on.
  */
 bool GameController::handlePlayerClick(ScreenCoordinate coord, Player& player) {
-	using namespace std::placeholders;
-	Player& initiating = *model.getPlayers()[0];
-	Player& receiving = player;
-	auto priority = -10;
-	
-	std::array<int, 5> initial{{0, 0, 0, 0, 0}};
-	
-	//std::function<bool(std::array<int, 5>, ScreenCoordinate)> tradeFunction(std::bind(&GameController::handleTradeOffer, this, _2, std::ref(initiating), _1, std::ref(receiving)));
-	std::function<bool(std::array<int, 5>, ScreenCoordinate)> tradeFunction([this, &initiating, &receiving](std::array<int, 5> offer, ScreenCoordinate coord) {
+	if(getState() == BASESTATE){
+		using namespace std::placeholders;
+		Player& initiating = *model.getPlayers()[0];
+		Player& receiving = player;
+		auto priority = -10;
+
 		std::array<int, 5> initial{{0, 0, 0, 0, 0}};
-		std::array<int, 5> reverseOffer = negativeArr<5>(offer);
-		handleTradeOffer(coord, receiving, initial, initiating, reverseOffer);
-		return true;
-	});
-	std::function<bool(ScreenCoordinate)> cancelFunction([this, priority](ScreenCoordinate coord) {
-		view.removeElement(priority); 
+
+		//std::function<bool(std::array<int, 5>, ScreenCoordinate)> tradeFunction(std::bind(&GameController::handleTradeOffer, this, _2, std::ref(initiating), _1, std::ref(receiving)));
+		std::function<bool(std::array<int, 5>, ScreenCoordinate)> tradeFunction([this, &initiating, &receiving](std::array<int, 5> offer, ScreenCoordinate coord) {
+			std::array<int, 5> initial{{0, 0, 0, 0, 0}};
+			std::array<int, 5> reverseOffer = negativeArr<5>(offer);
+			handleTradeOffer(coord, receiving, initial, initiating, reverseOffer);
+			return true;
+		});
+		std::function<bool(ScreenCoordinate)> cancelFunction([this, priority](ScreenCoordinate coord) {
+			view.removeElement(priority);
+			return true;
+		});
+
+		view.addElement(priority, std::unique_ptr<ViewElement>(new TradingView(initiating, receiving, tradeFunction, cancelFunction, initial)));
+		std::cout << player.getName() << std::endl;
 		return true;
-	});
+	}else if(getState() == KNIGHT_DEVCARD){
+		model.getCurrentPlayer().playKnight(getPastClick(0), player);
+	}
 
-	view.addElement(priority, std::unique_ptr<ViewElement>(new TradingView(initiating, receiving, tradeFunction, cancelFunction, initial)));
-	std::cout << player.getName() << std::endl;
-	return true;
 }
 
 /**
@@ -437,3 +454,58 @@ bool GameController::handleTradeOffer(ScreenCoordinate coord, Player& initiating
 	return true;
 }
 
+bool GameController::handleWoodButtonEvent(ScreenCoordinate coord){
+	if(getState() == YEAROFPLENTY_DEVCARD){
+		model.getCurrentPlayer().playYearOfPlenty(WOOD);
+		return handleCancelButtonEvent(coord);
+	}else if(getState() == MONOPOLY_DEVCARD){
+		model.getCurrentPlayer().playMonopoly(WOOD);
+		return handleCancelButtonEvent(coord);
+	}
+	return false;
+}
+bool GameController::handleSheepButtonEvent(ScreenCoordinate coord){
+	if(getState() == YEAROFPLENTY_DEVCARD){
+		model.getCurrentPlayer().playYearOfPlenty(SHEEP);
+		return handleCancelButtonEvent(coord);
+	}else if(getState() == MONOPOLY_DEVCARD){
+		model.getCurrentPlayer().playMonopoly(SHEEP);
+		return handleCancelButtonEvent(coord);
+	}
+	return false;
+
+}
+bool GameController::handleWheatButtonEvent(ScreenCoordinate coord){
+	if(getState() == YEAROFPLENTY_DEVCARD){
+		model.getCurrentPlayer().playYearOfPlenty(WHEAT);
+		return handleCancelButtonEvent(coord);
+	}else if(getState() == MONOPOLY_DEVCARD){
+		model.getCurrentPlayer().playMonopoly(WHEAT);
+		return handleCancelButtonEvent(coord);
+	}
+	return false;
+
+}
+bool GameController::handleOreButtonEvent(ScreenCoordinate coord){
+	if(getState() == YEAROFPLENTY_DEVCARD){
+		model.getCurrentPlayer().playYearOfPlenty(STONE);
+		return handleCancelButtonEvent(coord);
+	}else if(getState() == MONOPOLY_DEVCARD){
+		model.getCurrentPlayer().playMonopoly(STONE);
+		return handleCancelButtonEvent(coord);
+	}
+	return false;
+
+}
+bool GameController::handleBrickButtonEvent(ScreenCoordinate coord){
+	if(getState() == YEAROFPLENTY_DEVCARD){
+		model.getCurrentPlayer().playYearOfPlenty(BRICK);
+		return handleCancelButtonEvent(coord);
+	}else if(getState() == MONOPOLY_DEVCARD){
+		model.getCurrentPlayer().playMonopoly(BRICK);
+		return handleCancelButtonEvent(coord);
+	}
+	return false;
+
+}
+