Merge pull request #32 from Databean/player_turn

Player turn

Author: Kdog0073

.project

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>warsofcatan</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>

include/GameBoard.h

@@ -38,6 +38,9 @@ class GameBoard {
 	std::vector<std::unique_ptr<Player>> players;
 	Coordinate robber;
 
+	int currentTurn;
+
+	int maxVictoryPoints;
 
     void addResource(int x, int y, resourceType res, int val);
     bool checkRolls(int* rolls);
@@ -77,7 +80,11 @@ class GameBoard {
 
 	const std::map<Coordinate, std::unique_ptr<ResourceTile>>& getResources() const;
 
+	void endTurn();
+	Player& getCurrentPlayer() const;
 
+	int getMaxVictoryPoints();
+	void setMaxVictoryPoints(int maxVicPts);
 
 	const std::shared_ptr<Road> getRoad(Coordinate start, Coordinate end) const;
 	const std::vector<std::shared_ptr<Road>>& getRoads(Coordinate loc) const;

include/GameController.h

@@ -29,11 +29,12 @@ class GameController {
 	GameController(GameBoard&, GameView& view);
 	~GameController();
 
+	bool nextTurn(ScreenCoordinate);
 	bool handleBoardEvent(ScreenCoordinate);
 	bool handleRoadButtonEvent(ScreenCoordinate);
 	bool handleSettlementButtonEvent(ScreenCoordinate);
 	bool handlePlayerClick(ScreenCoordinate, Player&);
 	bool handleTradeOffer(ScreenCoordinate, Player& initiating, std::array<int, 5>, Player& receiving, std::array<int, 5>);
 };
 
-#endif
+#endif

src/GameBoard.cpp

@@ -40,6 +40,8 @@ GameBoard::GameBoard(const vector<std::string>& playerNames) {
 		players.push_back(std::unique_ptr<Player>(new Player(*this, name)));
 	}
 
+	currentTurn = 0;
+
 	std::srand(std::time(0));
 
 	const static vector<resourceType> boardResources {BRICK, BRICK, BRICK, STONE, STONE, STONE, WHEAT, WHEAT, WHEAT, WHEAT, WOOD, WOOD, WOOD, WOOD, SHEEP, SHEEP, SHEEP, SHEEP};
@@ -126,6 +128,7 @@ GameBoard::GameBoard(const std::vector<std::string>& playerNames, const std::map
 	if(!isValidBoard()) {
 		throw std::runtime_error("Board is invalid.");
 	}
+	currentTurn = 0;
 }
 
 /**
@@ -253,6 +256,8 @@ GameBoard::GameBoard(istream& in) {
 	if(!isValidBoard()) {
 		throw std::runtime_error("Board is invalid.");
 	}
+
+	currentTurn = 0; //have to update <<--
 }
 
 /**
@@ -307,6 +312,50 @@ ResourceTile& GameBoard::getResourceTile(Coordinate location) const
 	return *(resources.find(location)->second);
 }
 
+
+/**
+ * Ends current players turn and moves the current turn marker
+ */
+void GameBoard::endTurn()
+{
+	if(getCurrentPlayer().getVictoryPoints() >= getMaxVictoryPoints())
+		std::cout<<"GG Bitches";
+
+	currentTurn++;
+	if(currentTurn >= getNoOfPlayers())
+		currentTurn = 0;
+
+	startTurn();
+}
+
+/**
+ * @return reference to the current Player
+ */
+Player& GameBoard::getCurrentPlayer() const
+{
+	return *players[currentTurn];
+}
+
+
+/**
+ * @return The no of Victory points needed to win the game
+ */
+int GameBoard::getMaxVictoryPoints()
+{
+	return maxVictoryPoints;
+}
+
+
+/**
+ * Sets the no of victory points needed to win the game
+ * @param maxVicPts victory points needed to win the game
+ */
+void GameBoard::setMaxVictoryPoints(int maxVicPts)
+{
+	maxVictoryPoints = maxVicPts;
+}
+
+
 /**
  * Finds settlements neighboring a particular coordinate.
  * @param location The location to search the neighbors of.
@@ -481,7 +530,7 @@ bool GameBoard::PlaceRoad(Coordinate start, Coordinate end, Player& Owner) {
 	roads[start].push_back(newRoad);
 	roads[end].push_back(newRoad);
 
-    startTurn();
+//    startTurn();
 
 	return true;
 }

src/GameController.cpp

@@ -16,13 +16,16 @@
  */
 GameController::GameController(GameBoard& model, GameView& view) : model(model), view(view), placingRoads(false), placingCities(false) ,lastCoordClick(-100, -100) {
 	using namespace std::placeholders;
-	
+
+
+	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 = "resources/TypeWritersSubstitute-Black.ttf";
 	auto fontSize = 50;
 
-	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, "Settlement"));
-	
+
 	auto playerTopY = 0.9;
 	for(auto i = 0; i < model.getNoOfPlayers(); i++) {
 		auto width = 0.2;
@@ -31,6 +34,7 @@ GameController::GameController(GameBoard& model, GameView& view) : model(model),
 		playerTopY -= 0.05;
 	}
 
+
 	view.addElement(makeViewButton(std::bind(&GameController::handleBoardEvent, this, _1), {{0, 0}, {1, 1}}));
 }
 
@@ -41,6 +45,15 @@ GameController::~GameController() {
 
 }
 
+/**
+ *  calls a function to advance turn, check for victory and roll dice
+ */
+bool GameController::nextTurn(ScreenCoordinate) {
+	model.endTurn();
+	return true;
+}
+
+
 /**
  * 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.