Added button to build cities

Author: Databean

include/GameBoard.h

@@ -108,6 +108,9 @@ class GameBoard {
 	bool canPlaceSettlement(const Coordinate& location, const Player& owner);
 	bool buySettlement(const Coordinate& location, Player& owner);
 
+	bool canUpgradeSettlement(Coordinate location, const Player& owner) const;
+	bool buyUpgradeOnSettlement(Coordinate location, Player& owner);
+	
 	//void PlaceSettlement(Coordinate location, Player& Owner);
 	void PlaceCity(Coordinate location, Player& Owner);
 	void PlaceWonder(Coordinate location, Player& Owner);

include/GameController.h

@@ -12,7 +12,7 @@ class GameView;
 class Player;
 
 
-enum ControlState {BASESTATE, MODALSTATE, BUILDROAD, BUILDSETTLEMENT, ROBBER,
+enum ControlState {BASESTATE, MODALSTATE, BUILDROAD, BUILDSETTLEMENT, BUILDCITY, ROBBER,
 	VICTORYPOINT_DEVCARD, BUILDROAD_DEVCARD, KNIGHT_DEVCARD, YEAROFPLENTY_DEVCARD, MONOPOLY_DEVCARD};
 
 
@@ -38,6 +38,7 @@ class GameController {
 	bool handleBoardEvent(ScreenCoordinate);
 	bool handleRoadButtonEvent(ScreenCoordinate);
 	bool handleSettlementButtonEvent(ScreenCoordinate);
+	bool handleCityButtonEvent(ScreenCoordinate);
 	bool handleRoadCardButtonEvent(ScreenCoordinate);
 	bool handleKnightCardButtonEvent(ScreenCoordinate);
 	bool handleYearOfPlentyCardButtonEvent(ScreenCoordinate);

src/GameBoard.cpp

@@ -807,6 +807,7 @@ bool GameBoard::buySettlement(const Coordinate& location, Player& owner) {
 			return false;
 		}
 		PlaceSettlement(location, owner);
+		return true;
 	}
 	return false;
 }
@@ -822,6 +823,43 @@ void GameBoard::PlaceSettlement(Coordinate location, Player& Owner){
 
 }
 
+/**
+ * Whether a settlement at a location can be upgraded to a city. 
+ */
+bool GameBoard::canUpgradeSettlement(Coordinate location, const Player& owner) const {
+	auto it = corners.find(location);
+	if(it == corners.end()) {
+		std::cout << "there's nothing there" << std::endl;
+		return false;
+	}
+	if(!it->second) {
+		std::cout << "null ptr there" << std::endl;
+		return false;
+	}
+	if(!(it->second->getOwner() == owner)) {
+		std::cout << "wrong owner" << std::endl;
+		return false;
+	}
+	if(dynamic_cast<const Settlement*>(it->second.get()) == 0) {
+		std::cout << "this isn't a settlement" << std::endl;
+		return false;
+	}
+	return true;
+}
+
+bool GameBoard::buyUpgradeOnSettlement(Coordinate location, Player& owner) {
+	if(canUpgradeSettlement(location, owner) && owner.canBuyCity()) {
+		if(!owner.buyCity()) {
+			std::cout << "wat" << std::endl;
+			return false;
+		}
+		UpgradeSettlement(location);
+		return true;
+	}
+	std::cout << "failed for some reason" << std::endl;
+	return false;
+}
+
 /**
  * Place a city on the board.
  * @param location Where to place it on the board.

src/GameController.cpp

@@ -23,9 +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::nextTurn, this, _1), {{0, 0.2}, {0.1, 0.3}}, font, fontSize, "Turn"));
 	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"));
 
 	auto playerTopY = 0.9;
 	for(auto i = 0; i < model.getNoOfPlayers(); i++) {
@@ -204,6 +205,11 @@ bool GameController::handleBoardEvent(ScreenCoordinate screenCoord) {
 		model.buySettlement(coord, model.getCurrentPlayer());
 		popState();
 		break;
+	case BUILDCITY:
+		std::cout << "attempting to build a city" << std::endl;
+		model.buyUpgradeOnSettlement(coord, model.getCurrentPlayer());
+		popState();
+		break;
 	default:
 		break;
 	}
@@ -238,7 +244,7 @@ bool GameController::handleRoadButtonEvent(ScreenCoordinate coord) {
 }
 
 /**
- * Handles a click on the "create settlement" button. Changes the internal state to indicate the user is going to be making roads on the board.
+ * Handles a click on the "create settlement" button. Changes the internal state to indicate the user is going to be making settlements on the board.
  * @param coord The place the user clicked on screen.
  * @return Whether this event was handled by this element. Always true.
  */
@@ -250,6 +256,18 @@ bool GameController::handleSettlementButtonEvent(ScreenCoordinate coord) {
 	return true;
 }
 
+/**
+ * Handles a click on the "create city" button. Changes the internal state to indicate the user is going to be upgrading settlements to cities on the board.
+ * @param coord The place the user clicked on screen.
+ * @return Whether this event was handled by this element. Always true.
+ */
+bool GameController::handleCityButtonEvent(ScreenCoordinate coord) {
+	if(getState() == BASESTATE) {
+		pushState(BUILDCITY);
+	}
+	return true;
+}
+
 
 /**
  * Handles a click on the road Building Card button. This changes the control state to indicate the user is going to be building roads on the board.

src/Player.cpp

@@ -214,6 +214,7 @@ bool Player::canBuyCity(){
 bool Player::buyCity(){
 	if(canBuyCity()){
 		addMultiple(0,0,-3,-2,0);
+		return true;
 	}
 	return false;
 }