Merge branch 'master' into tradeWithBank

Conflicts:
	src/GameController.cpp

Author: Databean

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);
@@ -57,13 +58,15 @@ class GameController {
 
 	bool handleConfirmRoadCard(ScreenCoordinate);
 	bool handleCancelDialogueEvent(ScreenCoordinate);
+    
+    bool viewCardTotals(ScreenCoordinate coord);
 
 	void pushState(ControlState);
 	ControlState getState();
 	ControlState popState();
 	void storeClick(Coordinate clickCoordinate);
 	Coordinate getLastClick();
-	Coordinate getPastClick(int howLongAgo);
+	Coordinate getPastClick(unsigned int howLongAgo);
 	void clearClickHistory();
 	bool hasClickHistory();
 	int getClickHistorySize();

include/GameView.h

@@ -52,13 +52,12 @@ class GameView {
 	std::vector<ScreenCoordinate> pointsOfInterest;
 
 	void highlightPoint(ScreenCoordinate & coord);
-	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:
 	GameView(GameBoard&);
 	~GameView();
@@ -78,6 +77,10 @@ class GameView {
 	std::unique_ptr<ViewElement> removeElement(int priority);
 	std::unique_ptr<ViewElement> removeElement(const ViewElement*);
 	std::unique_ptr<ViewElement> removeElement(const ViewElement&);
+    
+    void drawCardCount(std::string font, int fontSize);
+	void drawResourceCount(std::string font, int fontSize);
+    bool showTotals;
 };
 
 /**

src/GameBoard.cpp

@@ -875,6 +875,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

@@ -24,6 +24,7 @@ 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::handleWonderButtonEvent, this, _1), {{0.55, 0.0}, {0.65, 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;
@@ -43,15 +44,16 @@ GameController::GameController(GameBoard& model, GameView& view) : model(model),
 	view.addElement(makeViewButtonText(std::bind(&GameController::handleYearOfPlentyCardButtonEvent, this, _1), {{0.85, 0.10}, {0.97, 0.15}},  font, fontSize, "Year of Plenty "));
 	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 "));
 
+	view.addElement(makeViewButtonText(std::bind(&GameController::handleWoodButtonEvent, this, _1), {{.85, .30}, {.97, .35}}, font, fontSize, "Wood "));
+	view.addElement(makeViewButtonText(std::bind(&GameController::handleSheepButtonEvent, this, _1), {{.85, .35}, {.97, .40}}, font, fontSize, "Sheep "));
+	view.addElement(makeViewButtonText(std::bind(&GameController::handleOreButtonEvent, this, _1), {{.85, .40}, {.97, .45}}, font, fontSize, "Ore "));
+	view.addElement(makeViewButtonText(std::bind(&GameController::handleBrickButtonEvent, this, _1), {{.85, .45}, {.97, .50}}, font, fontSize, "Brick "));
+	view.addElement(makeViewButtonText(std::bind(&GameController::handleWheatButtonEvent, this, _1), {{.85, .50}, {.97, .55}}, font, fontSize, "Wheat "));
+    
+    view.addElement(makeViewButtonText(std::bind(&GameController::viewCardTotals, this, _1), {{.85, .55}, {.97, .60}}, font, fontSize, "Show Totals"));
+
 	view.addElement(100, makeViewButton(std::bind(&GameController::handleBoardEvent, this, _1), {{0, 0}, {1, 1}}));
-	
 	stateStack.push_back(BASESTATE);
 }
 
@@ -109,7 +111,7 @@ Coordinate GameController::getLastClick(){
  * Gets a click from param clicks ago
  * @ param an integer
  */
-Coordinate GameController::getPastClick(int howLongAgo){
+Coordinate GameController::getPastClick(unsigned int howLongAgo){
 	if (howLongAgo < clickHistory.size()){
 		return clickHistory[clickHistory.size() - 1 - howLongAgo];
 	}
@@ -138,20 +140,27 @@ int GameController::getClickHistorySize(){
 	return clickHistory.size();
 }
 
-void printPlayerInfo(const Player& player) {
+/**
+ * Now that the GUI has this information implemented, I am returning before this function prints.  To use this function again simply remove the return
+ */
+void printPlayerInfo(const Player& player)
+{
+    return;
 	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
+ *  calls a function to advance turn, hide resource and development cards, check for victory, and roll dice
  */
 bool GameController::nextTurn(ScreenCoordinate) {
 	if(getState() != BASESTATE){
 		return false;
 	}
-
+    
+    view.showTotals = false;
+    
 	model.endTurn();
 	if (model.getDice().getFirst() + model.getDice().getSecond() == 7)
 	{
@@ -223,6 +232,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 +326,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.
@@ -413,6 +442,19 @@ bool GameController::handleVictoryPointCardButtonEvent(ScreenCoordinate coord){
 	return true;
 }
 
+/**
+ * Makes the development and resource card totals visible
+ */
+bool GameController::viewCardTotals(ScreenCoordinate coord)
+{
+    auto font = getGraphicsConfig()["font.path"];
+	auto fontSize = getGraphicsConfig()["font.size"];
+    view.showTotals = !view.showTotals;
+    view.drawCardCount(font, fontSize);
+    view.drawResourceCount(font, fontSize);
+    return true;
+}
+
 
 template<int size>
 auto negativeArr(std::array<int, size> arr) -> std::array<int, size> {
@@ -473,7 +515,7 @@ bool GameController::handlePlayerClick(ScreenCoordinate coord, Player& player) {
 			return handleCancelButtonEvent(coord);
 		}
 	}
-	
+	return true;
 }
 
 /**
@@ -521,10 +563,10 @@ bool GameController::handleTradeOffer(ScreenCoordinate coord, Player& initiating
 		std::array<int, 5> splitOffer;
 		std::array<int, 5> splitDemand;
 		for(int i = 0; i < 5; i++) {
-			splitOffer[i] = counterOffer[i] < 0 ? 0 : -counterOffer[i];
+			splitOffer[i] = counterOffer[i] > 0 ? 0 : -counterOffer[i];
 			splitDemand[i] = counterOffer[i] < 0 ? 0 : counterOffer[i];
 		}
-		initiating.acceptOffer(receiving, splitOffer, splitDemand);
+		initiating.acceptOffer(receiving, splitDemand, splitOffer);
 	} else {
 		//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, counterOffer](std::array<int, 5> offer, ScreenCoordinate coord) {

src/GameView.cpp

@@ -86,9 +86,10 @@ bool ViewElement::handleClick(ScreenCoordinate coord) {
  * Constrct a GameView.
  * @param model The GameBoard the view is displaying.
  */
-GameView::GameView(GameBoard& model) : model(model) {
+GameView::GameView(GameBoard& model) : model(model)
+{
 	controlStateText = "Welcome to Wars of Catan";
-	
+	showTotals = false;
 }
 
 /**
@@ -104,7 +105,19 @@ GameView::~GameView() {
  * @param font the style of font to use, fontSize the resolution of the font used
  * @return void
  */
-void GameView::drawCardCount(std::string font, int fontSize){
+void GameView::drawCardCount(std::string font, int fontSize)
+{
+    if (showTotals==false)
+    {
+        renderText(font, fontSize, {0.97, 0.0}, {1.0, 0.05}, "?");	//Road Building
+        renderText(font, fontSize, {0.97, 0.05}, {1.0, 0.1}, "?");		//Knight
+        renderText(font, fontSize, {0.97, 0.1}, {1.0, 0.15}, "?");	//Year of Plenty
+        renderText(font, fontSize, {0.97, 0.15}, {1.0, 0.2}, "?");		//Monopoly
+        renderText(font, fontSize, {0.97, 0.2}, {1.0, 0.25}, "?");		//Victory Point
+        return;
+    }
+    
+    
 	renderText(font, fontSize, {0.97, 0.0}, {1.0, 0.05},
 			toString(model.getCurrentPlayer().getRoadBuildingCards()));	//Road Building
 	renderText(font, fontSize, {0.97, 0.05}, {1.0, 0.1},
@@ -120,16 +133,27 @@ void GameView::drawCardCount(std::string font, int fontSize){
 /**
  * Draws the count of resources the currentPlayer has
  */
-void GameView::drawResourceCount(std::string font, int fontSize){
-	renderText(font, fontSize, {0.97, 0.35}, {1.0, 0.40},
+void GameView::drawResourceCount(std::string font, int fontSize)
+{
+    if(showTotals==false)
+    {
+        renderText(font, fontSize, {0.97, 0.30}, {1.0, 0.35}, "?");		//Wood
+        renderText(font, fontSize, {0.97, 0.35}, {1.0, 0.40}, "?");		//Sheep
+        renderText(font, fontSize, {0.97, 0.40}, {1.0, 0.45}, "?");		//Ore
+        renderText(font, fontSize, {0.97, 0.45}, {1.0, 0.50}, "?");		//Brick
+        renderText(font, fontSize, {0.97, 0.50}, {1.0, 0.55}, "?");     //Wheat
+        return;
+    }
+    
+	renderText(font, fontSize, {0.97, 0.30}, {1.0, 0.35},
 			toString(model.getCurrentPlayer().getWood()));		//Wood
-	renderText(font, fontSize, {0.97, 0.40}, {1.0, 0.45},
+	renderText(font, fontSize, {0.97, 0.35}, {1.0, 0.40},
 			toString(model.getCurrentPlayer().getWool()));		//Sheep
-	renderText(font, fontSize, {0.97, 0.45}, {1.0, 0.50},
+	renderText(font, fontSize, {0.97, 0.40}, {1.0, 0.45},
 			toString(model.getCurrentPlayer().getOre()));		//Ore
-	renderText(font, fontSize, {0.97, 0.50}, {1.0, 0.55},
+	renderText(font, fontSize, {0.97, 0.45}, {1.0, 0.50},
 			toString(model.getCurrentPlayer().getBrick()));		//Brick
-	renderText(font, fontSize, {0.97, 0.55}, {1.0, 0.60},
+	renderText(font, fontSize, {0.97, 0.50}, {1.0, 0.55},
 			toString(model.getCurrentPlayer().getWheat()));		//Wheat
 
 }

tests/testRenderer.cpp

@@ -1,19 +1,29 @@
 #include <iostream>
+#include <vector>
 
 #include "gtest/gtest.h"
 
 #include "Renderer.h"
 
+using std::vector;
 using std::make_pair;
 
-TEST(RendererTest, coordToScreen) {
+class CoordinateConversionTest : public ::testing::TestWithParam<Coordinate> {
+	
+};
+
+TEST_P(CoordinateConversionTest, IsReversable) {
+	ASSERT_EQ(GetParam(), screenToCoord(coordToScreen(GetParam())));
+}
+
+vector<Coordinate> makeInputs() {
+	vector<Coordinate> ret;
 	for(int x = -5; x < 5; x++) {
-		for(auto y = -5; y < 5; y++) {
-			auto original = make_pair(x, y);
-			auto screen = coordToScreen(original);
-			auto back = screenToCoord(screen);
-			ASSERT_EQ(original.first, back.first);
-			ASSERT_EQ(original.second, back.second);
+		for(int y = -5; y < 5; y++) {
+			ret.push_back(Coordinate{x, y});
 		}
 	}
+	return std::move(ret);
 }
+
+INSTANTIATE_TEST_CASE_P(LargeSquare, CoordinateConversionTest, ::testing::ValuesIn(makeInputs()));

tests/test_GameBoard.cpp

@@ -328,11 +328,9 @@ TEST(GameBoardTest, updateLongestRoadPlayer){
 TEST(GameBoardTest, canRobberRob){
 	GameBoard test_board({"tester1", "tester2"});
 	Player& test_player1 = test_board.getPlayer(0);
-	Player& test_player2 = test_board.getPlayer(1);
-
-
+	
 	ASSERT_FALSE(test_board.canRobberRob(test_player1, Coordinate(0,1)));
-
+	
 	test_board.PlaceSettlement(Coordinate(0,0), test_player1);
 	ASSERT_TRUE(test_board.canRobberRob(test_player1, Coordinate(0,1)));
 }