Merge pull request #44 from Databean/buyingInterface

Buying interface

Author: Kdog0073

include/GameBoard.h

@@ -101,11 +101,16 @@ class GameBoard {
 	void PlaceSettlement(Coordinate location, Player& Owner);
 	void UpgradeSettlement(Coordinate location);
 	void UpgradeToWonder(Coordinate location);
-
-
+	
 	bool verifyRoadPlacement(Coordinate start, Coordinate end, Player& Owner) const;
 	bool buyRoad(Coordinate start, Coordinate end, Player& Owner);
-
+	
+	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);

include/Player.h

@@ -71,7 +71,7 @@ class Player {
     void setLongestRoad(bool);
     void setLongestRoadSize(int);
 
-    std::tuple<float, float, float> getColor();
+    std::tuple<float, float, float> getColor() const;
 
     int getVictoryPointsWithoutCards();
     int getVictoryPointCards();

resources/graphics.conf

@@ -3,8 +3,8 @@ font.path=resources/ComicNeue-Bold.ttf
 font.size=50
 
 # General window settings
-screen.width=900
-screen.height=800
+screen.width=1280
+screen.height=720
 
 # Trading view screen coordinates
 screen.tradingView.bottomLeft=(0.1,0.1)

src/GameBoard.cpp

@@ -410,8 +410,8 @@ std::vector<CornerPiece*> GameBoard::GetNeighboringCorners(
 		const Coordinate& diff = adjacentCoordDiffs[i];
 		Coordinate adjacentPoint(location.first + diff.first,
 				location.second + diff.second);
-		auto it = resources.find(adjacentPoint);
-		if (it != resources.end()) {
+		auto it = corners.find(adjacentPoint);
+		if (it != corners.end()) {
 			GamePiece* piece = it->second.get();
 			if (dynamic_cast<CornerPiece*>(piece)) {
 				v.push_back(static_cast<CornerPiece*>(piece));
@@ -489,18 +489,26 @@ bool GameBoard::isRoadConnectionPoint(Coordinate point, Player& Owner) const {
  * @return If the road can be placed at the locations by the player.
  */
 bool GameBoard::verifyRoadPlacement(Coordinate start, Coordinate end, Player& Owner) const {
-	if (outOfBounds(start) || outOfBounds(end))
+	if (outOfBounds(start) || outOfBounds(end)) {
+		std::cout << "out of bounds" << std::endl;
 		return false;
-
-	if (roadExists(start, end))
+	}
+	
+	if (roadExists(start, end)) {
+		std::cout << "road exists" << std::endl;
 		return false;
-
-	if (!isRoadConnectionPoint(start, Owner) && !isRoadConnectionPoint(end, Owner)) //need to XOR
+	}
+	
+	if (!isRoadConnectionPoint(start, Owner) && !isRoadConnectionPoint(end, Owner)) { //need to XOR
+		std::cout << "not a road connection point" << std::endl;
 		return false;
-
-	if(!Road::isValidRoad(start, end))
+	}
+	
+	if(!Road::isValidRoad(start, end)) {
+		std::cout << "not a valid road" << std::endl;
 		return false;
-
+	}
+	
 	return true;
 }
 
@@ -548,8 +556,12 @@ Coordinate GameBoard::getRobber() const {
  * @returns True if the road was placed, false otherwise
  */
 bool GameBoard::PlaceRoad(Coordinate start, Coordinate end, Player& Owner) {
-	if (!verifyRoadPlacement(start, end, Owner))
+	if (!verifyRoadPlacement(start, end, Owner)) {
+		std::cout << "invalid road placement" << std::endl;
 		return false;
+	}
+	
+	std::cout << "passed verify" << std::endl;
 
 	std::shared_ptr<Road> newRoad;
 	try {
@@ -600,6 +612,7 @@ bool GameBoard::buyRoad(Coordinate start, Coordinate end, Player& Owner){
 		Owner.buyRoad();
 		return true;
 	}
+	std::cout << "failed to buy for some reason" << std::endl;
 	return false;
 }
 
@@ -743,6 +756,61 @@ void GameBoard::updateLargestArmyPlayer(){
 
 }
 
+/**
+ * Whether a player can place a settlement at a location.
+ * @param location The place to put the settlement.
+ * @param owner The player placing the settlement.
+ * @return If the location is a valid place to put a settlement.
+ */
+bool GameBoard::canPlaceSettlement(const Coordinate& location, const Player& owner) {
+	//Don't place this on top of a resource
+	if(resources.find(location) != resources.end()) {
+		std::cout << "can't put settlements on top of resource tiles" << std::endl;
+		return false;
+	}
+	//Don't place this on top of another settlement
+	if(corners.find(location) != corners.end()) {
+		std::cout << "can't put a settlement on top of another corner piece" << std::endl;
+		return false;
+	}
+	//Don't place this off the map
+	if(outOfBounds(location)) {
+		std::cout << "this is out of bounds" << std::endl;
+		return false;
+	}
+	//Can't have a settlement next to another settlement.
+	if(GetNeighboringCorners(location).size() > 0) {
+		std::cout << "there's an adjacent corner piece" << std::endl;
+		return false;
+	}
+	for(auto road : getRoads(location)) {
+		if(road->getOwner() == owner) {
+			//Player has a connecting road
+			return true;
+		}
+	}
+	std::cout << "there are no connecting roads" << std::endl;
+	//Player has no connecting roads
+	return false;
+}
+
+/**
+ * Buy a settlement if possible.
+ * @param location The location to place the settlement.
+ * @param owner The player buying the settlement.
+ * @return If placing the settlement was a success.
+ */
+bool GameBoard::buySettlement(const Coordinate& location, Player& owner) {
+	if(canPlaceSettlement(location, owner) && owner.canBuySettlement()) {
+		if(!owner.buySettlement()) {
+			std::cout << "wat" << std::endl;
+			return false;
+		}
+		PlaceSettlement(location, owner);
+		return true;
+	}
+	return false;
+}
 
 /**
  * Place a settlement on the board.
@@ -755,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

@@ -17,16 +17,17 @@
  */
 GameController::GameController(GameBoard& model, GameView& view) : model(model), view(view) {
 	using namespace std::placeholders;
-
+	
 	view.addElement(makeViewButton(std::bind(&GameController::handleBoardEvent, this, _1), {{0, 0}, {1, 1}}));
-
-	view.addElement(makeViewButtonColor(std::bind(&GameController::nextTurn, this, _1), {{0, 0.2}, {0.1, 0.3}}, std::make_tuple(0.f, 0.f, 1.f)));
-	view.addElement(makeViewButtonColor(std::bind(&GameController::handleRoadButtonEvent, this, _1), {{0, 0}, {0.1, 0.1}}, std::make_tuple(1.f, 0.f, 0.f)));
-	view.addElement(makeViewButtonColor(std::bind(&GameController::handleSettlementButtonEvent, this, _1), {{0, 0.1}, {0.1, 0.2}}, std::make_tuple(0.f, 1.0f, 0.f)));
 
 	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"));
+	
 	auto playerTopY = 0.9;
 	for(auto i = 0; i < model.getNoOfPlayers(); i++) {
 		auto width = 0.15;
@@ -131,15 +132,18 @@ int GameController::getClickHistorySize(){
 	return clickHistory.size();
 }
 
-
-
-
+void printPlayerInfo(const Player& player) {
+	auto color = player.getColor();
+	std::cout << player.getName() << "'s turn. (" << std::get<0>(color) << ", " << std::get<1>(color) << ", " << std::get<2>(color) <<")" << std::endl;
+	std::cout << "Wood: " << player.getWood() << ", Brick: " << player.getBrick() << ", Ore: " << player.getOre() << ", Wheat: " << player.getWheat() << ", Wool: " << player.getWool() << std::endl;
+}
 
 /**
  *  calls a function to advance turn, check for victory and roll dice
  */
 bool GameController::nextTurn(ScreenCoordinate) {
 	model.endTurn();
+	printPlayerInfo(model.getCurrentPlayer());
 	return true;
 }
 
@@ -150,14 +154,15 @@ bool GameController::nextTurn(ScreenCoordinate) {
  * @return Whether this event was handled by this element. Always true.
  */
 bool GameController::handleBoardEvent(ScreenCoordinate screenCoord) {
+	printPlayerInfo(model.getCurrentPlayer());
 	auto coord = screenToCoord(screenCoord);
-
+	
 	switch (getState()){
 	case BUILDROAD:
 		if(!hasClickHistory()) {
 			storeClick(coord);
 		} else {
-			if (model.PlaceRoad(getLastClick(), coord, *model.getPlayers()[0]));
+			if (model.buyRoad(getLastClick(), coord, model.getCurrentPlayer()));
 			{
 				popState();
 			}
@@ -196,8 +201,13 @@ bool GameController::handleBoardEvent(ScreenCoordinate screenCoord) {
 		popState();
 		break;
 	case BUILDSETTLEMENT:
-		std::cout << "BUILDSETTLEMENT\n";
-		model.PlaceSettlement(coord, *model.getPlayers()[0]);
+		std::cout << "attempting to buy a settlement" << std::endl;
+		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:
@@ -234,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.
  */
@@ -246,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

@@ -111,7 +111,7 @@ Player::~Player() {
 
 }
 
-std::tuple<float, float, float> Player::getColor(){
+std::tuple<float, float, float> Player::getColor() const {
 	return color;
 }
 
@@ -214,6 +214,7 @@ bool Player::canBuyCity(){
 bool Player::buyCity(){
 	if(canBuyCity()){
 		addMultiple(0,0,-3,-2,0);
+		return true;
 	}
 	return false;
 }

src/Renderer.cpp

@@ -145,10 +145,11 @@ pair<float, float> coordToScreen(const Coordinate& coord) {
 	using std::sin;
 	using std::cos;
 	// TODO not magic numbers
-	static const float scale = 0.1f;
+	static const float xscale = 9.f / 16.f / 6.f;
+	static const float yscale = 0.1f;
 	static const float angle = M_PI / 3.f;
-	float x = .25f + (scale * coord.first) + ((scale * coord.second) * cos(angle));
-	float y = .1f + (scale * coord.second) * sin(angle);
+	float x = .25f + (xscale * coord.first) + ((yscale * coord.second) * cos(angle));
+	float y = .1f + (yscale * coord.second) * sin(angle);
 	return std::make_pair(x, y);
 }
 
@@ -158,12 +159,13 @@ pair<float, float> coordToScreen(const Coordinate& coord) {
  * @return The game coordinate.
  */
 Coordinate screenToCoord(const pair<float, float>& screen) {
-	static const float scale = 0.1;
+	static const float xscale = 9.f / 16.f / 6.f;
+	static const float yscale = 0.1f;
 	static const float angle = M_PI / 3.f;
 	Coordinate ret;
-	float y_approx = (screen.second - 0.1f) / std::sin(angle) / scale;
+	float y_approx = (screen.second - 0.1f) / std::sin(angle) / yscale;
 	ret.second = std::round(y_approx);
-	ret.first = std::round((screen.first - 0.2f) / scale - y_approx * std::cos(angle) - 0.5);
+	ret.first = std::round((screen.first - 0.25f - y_approx * yscale * std::cos(angle)) / xscale);
 	return ret;
 }