Merge pull request #60 from Databean/cp_UI2

Upgrade to Wonder button and action

Author: PickledMonkey

include/GameBoard.h

@@ -120,6 +120,9 @@ class GameBoard {
 	bool canUpgradeSettlement(Coordinate location, const Player& owner) const;
 	bool buyUpgradeOnSettlement(Coordinate location, Player& owner);
 
+	bool canUpgradeToWonder(Coordinate location, const Player& owner) const;
+	bool buyUpgradeOnWonder(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, BUILDCITY, ROBBER,
+enum ControlState {BASESTATE, MODALSTATE, BUILDROAD, BUILDSETTLEMENT, BUILDCITY, BUILDWONDER, ROBBER,
 	VICTORYPOINT_DEVCARD, BUILDROAD_DEVCARD, KNIGHT_DEVCARD, YEAROFPLENTY_DEVCARD, MONOPOLY_DEVCARD};
 
 
@@ -39,6 +39,7 @@ class GameController {
 	bool handleRoadButtonEvent(ScreenCoordinate);
 	bool handleSettlementButtonEvent(ScreenCoordinate);
 	bool handleCityButtonEvent(ScreenCoordinate);
+	bool handleWonderButtonEvent(ScreenCoordinate);
 	bool handleRoadCardButtonEvent(ScreenCoordinate);
 
 	bool handleBuyDevelopmentCardButtonEvent(ScreenCoordinate);

src/GameBoard.cpp

@@ -873,6 +873,43 @@ bool GameBoard::buyUpgradeOnSettlement(Coordinate location, Player& owner) {
 	return false;
 }
 
+/**
+ * Whether a settlement/city at a location can be upgraded to a wonder.
+ */
+bool GameBoard::canUpgradeToWonder(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 && dynamic_cast<const City*>(it->second.get()) == 0) {
+		std::cout << "this isn't a settlement or city" << std::endl;
+		return false;
+	}
+	return true;
+}
+
+bool GameBoard::buyUpgradeOnWonder(Coordinate location, Player& owner) {
+	if(canUpgradeToWonder(location, owner) && owner.canBuyCity()) {
+		if(!owner.buyWonder()) {
+			std::cout << "wat" << std::endl;
+			return false;
+		}
+		UpgradeToWonder(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

@@ -25,7 +25,8 @@ GameController::GameController(GameBoard& model, GameView& view) : model(model),
 
 	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::handleSettlementButtonEvent, this, _1), {{0.20, 0.0}, {0.33, 0.1}}, font, fontSize, "Settlement |"));
+	view.addElement(makeViewButtonText(std::bind(&GameController::handleWonderButtonEvent, this, _1), {{0.33, 0.0}, {0.43, 0.1}}, font, fontSize, "Wonder"));
 	view.addElement(makeViewButtonText(std::bind(&GameController::nextTurn, this, _1), {{0, 0.3}, {0.1, 0.4}}, font, fontSize, "End Turn"));
 
 	auto playerTopY = 0.82;
@@ -223,6 +224,11 @@ bool GameController::handleBoardEvent(ScreenCoordinate screenCoord) {
 		model.buyUpgradeOnSettlement(coord, model.getCurrentPlayer());
 		handleCancelButtonEvent(screenCoord);
 		break;
+	case BUILDWONDER:
+		std::cout << "attempting to build a wonder" << std::endl;
+		model.buyUpgradeOnWonder(coord, model.getCurrentPlayer());
+		handleCancelButtonEvent(screenCoord);
+		break;
 	default:
 		break;
 	}
@@ -312,6 +318,21 @@ bool GameController::handleCityButtonEvent(ScreenCoordinate coord) {
 	return true;
 }
 
+/**
+ * Handles a click on the "create wonder" button. Changes the internal state to indicate the user is going to be upgrading settlements/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::handleWonderButtonEvent(ScreenCoordinate coord) {
+	if(getState() != BASESTATE) {
+		return false;
+	}
+
+	view.setControlStateText("Click on a settlement/city to upgrade to wonder. (5 of ea rsc)");
+	pushState(BUILDWONDER);
+	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.