Merge pull request #46 from Databean/knightImplementation

merged

Author: apolitakis

include/GameBoard.h

@@ -17,6 +17,10 @@
 #include "tinyxml2.h"
 #include "Road.h"
 #include "GameDice.h"
+#include "Deck.h"
+
+#include "DevelopmentCard.h"
+
 
 class GameVisitor;
 
@@ -31,7 +35,7 @@ class GameBoard {
 
 	GameDice dice;
 
-
+	Deck deck;
 
 	std::map<Coordinate, std::vector<std::shared_ptr<Road>>> roads;
 
@@ -77,6 +81,9 @@ class GameBoard {
 
 	void save(std::ostream& out);
 
+	void buyCard(Player& owner);
+	void discardCard(DevelopmentCard * card);
+
 	ResourceTile& getResourceTile(Coordinate location) const;
 
 	const std::map<Coordinate, std::unique_ptr<ResourceTile>>& getResources() const;

include/GameController.h

@@ -40,10 +40,13 @@ class GameController {
 	bool handleSettlementButtonEvent(ScreenCoordinate);
 	bool handleCityButtonEvent(ScreenCoordinate);
 	bool handleRoadCardButtonEvent(ScreenCoordinate);
+
+	bool handleBuyDevelopmentCardButtonEvent(ScreenCoordinate);
 	bool handleKnightCardButtonEvent(ScreenCoordinate);
 	bool handleYearOfPlentyCardButtonEvent(ScreenCoordinate);
 	bool handleMonopolyCardButtonEvent(ScreenCoordinate);
 	bool handleVictoryPointCardButtonEvent(ScreenCoordinate);
+
 	bool handleCancelButtonEvent(ScreenCoordinate);
 
 	bool handleConfirmRoadCard(ScreenCoordinate);

include/GameView.h

@@ -53,6 +53,7 @@ class GameView {
 
 	void highlightPoint(ScreenCoordinate & coord);
 	void drawCardCount(std::string font, int fontSize);
+	void drawResourceCount(std::string font, int fontSize);
 
 	GameView(const GameView& o) = delete;
 	GameView& operator=(const GameView& o) = delete;
@@ -69,6 +70,7 @@ class GameView {
 	void addElement(std::unique_ptr<ViewElement> element);
 	void addElement(int priority, std::unique_ptr<ViewElement>);
 
+
 	std::unique_ptr<ViewElement> removeElement(int priority);
 	std::unique_ptr<ViewElement> removeElement(const ViewElement*);
 	std::unique_ptr<ViewElement> removeElement(const ViewElement&);

src/GameBoard.cpp

@@ -14,7 +14,6 @@
 
 #include "CornerPiece.h"
 #include "GameDice.h"
-
 #include "Settlement.h"
 #include "City.h"
 #include "Wonder.h"
@@ -422,6 +421,7 @@ std::vector<CornerPiece*> GameBoard::GetNeighboringCorners(
 }
 
 
+
 /**
  * Checks to make sure the coordinate is within bounds of the board and not a resource tile.
  * @param coord The coordinate to check.
@@ -1102,3 +1102,54 @@ void GameBoard::payoutResources(int roll)
         }
     }
 }
+
+/**
+ * Buys a card drawn from the deck
+ */
+void GameBoard::buyCard(Player& owner){
+	if(owner.canBuyCard() && deck.getSize() > 0){
+
+		DevelopmentCard * card_ptr = deck.drawCard();
+
+		std::unique_ptr<DevelopmentCard> knight = std::unique_ptr<DevelopmentCard>(new KnightCard());
+		std::unique_ptr<DevelopmentCard> victorypoint = std::unique_ptr<DevelopmentCard>(new VictoryPointCard());
+		std::unique_ptr<DevelopmentCard> monopoly = std::unique_ptr<DevelopmentCard>(new MonopolyCard());
+		std::unique_ptr<DevelopmentCard> yearofplenty = std::unique_ptr<DevelopmentCard>(new YearOfPlentyCard());
+		std::unique_ptr<DevelopmentCard> roadbuilding = std::unique_ptr<DevelopmentCard>(new RoadBuildingCard());
+
+		switch (card_ptr->getType()){
+		case KNIGHT:
+			owner.buyCard(knight);
+			break;
+		case VICTORYPOINT:
+			owner.buyCard(victorypoint);
+			break;
+		case MONOPOLY:
+			owner.buyCard(monopoly);
+			break;
+		case YEAROFPLENTY:
+			owner.buyCard(yearofplenty);
+			break;
+		case ROADBUILDING:
+			owner.buyCard(roadbuilding);
+			break;
+		default:
+			break;
+		}
+
+		delete(card_ptr);
+	}
+}
+
+/**
+ * Discards a card back into the deck
+ */
+void GameBoard::discardCard(DevelopmentCard * card){
+	deck.discard(card);
+}
+
+
+
+
+
+

src/GameController.cpp

@@ -38,6 +38,7 @@ GameController::GameController(GameBoard& model, GameView& view) : model(model),
 
 	view.addElement(makeViewButtonColor(std::bind(&GameController::handleCancelButtonEvent, this, _1), {{.95, .95}, {1.0, 1.0}}, std::make_tuple(1.f, 0.0f, 0.f)));
 
+	view.addElement(makeViewButtonText(std::bind(&GameController::handleBuyDevelopmentCardButtonEvent, this, _1), {{.85, .23}, {1, .30}}, font, fontSize, "Development Cards"));
 	view.addElement(makeViewButtonText(std::bind(&GameController::handleRoadCardButtonEvent, this, _1), {{0.85, 0.0}, {0.97, 0.05}}, font, fontSize, "Road Building "));
 	view.addElement(makeViewButtonText(std::bind(&GameController::handleKnightCardButtonEvent, this, _1), {{0.85, 0.05}, {0.97, 0.10}},  font, fontSize, "Knight "));
 	view.addElement(makeViewButtonText(std::bind(&GameController::handleYearOfPlentyCardButtonEvent, this, _1), {{0.85, 0.10}, {0.97, 0.15}},  font, fontSize, "Year of Plenty "));
@@ -305,6 +306,11 @@ bool GameController::handleCancelDialogueEvent(ScreenCoordinate coord){
 	return handleCancelButtonEvent(coord);
 }
 
+bool GameController::handleBuyDevelopmentCardButtonEvent(ScreenCoordinate coord){
+	model.buyCard(model.getCurrentPlayer());
+	return handleCancelButtonEvent(coord);
+}
+
 /**
  * Handles a click on the Knight Card button.
  * @param coord The place the user clicked

src/GameView.cpp

@@ -104,9 +104,6 @@ GameView::~GameView() {
  * @return void
  */
 void GameView::drawCardCount(std::string font, int fontSize){
-
-	renderText(font, fontSize, {.85, .23}, {1, .30}, "Development Cards");
-
 	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},
@@ -119,6 +116,20 @@ void GameView::drawCardCount(std::string font, int fontSize){
 			toString(model.getCurrentPlayer().getVictoryCards()));		//Victory Point
 }
 
+void GameView::drawResourceCount(std::string font, int fontSize){
+	renderText(font, fontSize, {0.97, 0.35}, {1.0, 0.40},
+			toString(model.getCurrentPlayer().getWood()));		//Wood
+	renderText(font, fontSize, {0.97, 0.40}, {1.0, 0.45},
+			toString(model.getCurrentPlayer().getWool()));		//Sheep
+	renderText(font, fontSize, {0.97, 0.45}, {1.0, 0.50},
+			toString(model.getCurrentPlayer().getOre()));		//Ore
+	renderText(font, fontSize, {0.97, 0.50}, {1.0, 0.55},
+			toString(model.getCurrentPlayer().getBrick()));		//Brick
+	renderText(font, fontSize, {0.97, 0.55}, {1.0, 0.60},
+			toString(model.getCurrentPlayer().getWheat()));		//Wheat
+
+}
+
 
 /**
  * Display the GameBoard to the screen as well as additional ViewElements.
@@ -143,6 +154,7 @@ void GameView::render() {
 	renderText(font, fontSize, {.2, .9}, {.8, 1}, "Settlers of Catan");
 
 	drawCardCount(font, fontSize);
+	drawResourceCount(font, fontSize);
 
 	glFlush();
 }

src/Player.cpp

@@ -159,26 +159,51 @@ bool Player::canBuySettlement(){
 	return getWood() >= 1 && getBrick() >= 1 && getWheat() >= 1 && getWool() >= 1;
 }
 
+/**
+ * Returns the number of knight cards this player has played
+ */
 int Player::getArmySize() const{
 	return armySize;
 }
+
+/**
+ * Returns true if this player has the largest army, false otherwise
+ */
 bool Player::hasLargestArmy() const{
 	return largestArmy;
 }
+
+/**
+ * Sets whether or not this player has the largest army
+ */
 void Player::setLargestArmy(bool newVal){
 	largestArmy = newVal;
 }
 
+/**
+ * Returns the size of this player's longest road
+ */
 int Player::getLongestRoadSize() const{
 	return longestRoadSize;
 }
+
+/**
+ * Returns true if this player has the longet road, false otherwise
+ */
 bool Player::hasLongestRoad() const{
 	return longestRoad;
 }
+
+/**
+ * Sets whether or not this player has the longest road
+ */
 void Player::setLongestRoad(bool newVal){
 	longestRoad = newVal;
 }
 
+/**
+ * Sets how long this player's longest road is
+ */
 void Player::setLongestRoadSize(int newVal){
 	longestRoadSize = newVal;
 }
@@ -262,7 +287,7 @@ bool Player::buyCard(){
 
 
 /**
- * Update the player's internal state with their victory states.
+ * Updates the player's victory points to the amount of points they have.
  */
 void Player::updateVictoryPoints()
 {
@@ -279,8 +304,7 @@ void Player::updateVictoryPoints()
 	if(largestArmy){
 		sum_points+=2;
 	}
-
-
+	victoryPoints = sum_points;
 }
 
 /**
@@ -481,6 +505,7 @@ bool Player::playYearOfPlenty(int resourceType){
 	if(developmentCards[YEAROFPLENTY] > 0){
 		developmentCards[YEAROFPLENTY]--;
 		addResource(resourceType, 2);
+		board.discardCard(new YearOfPlentyCard());
 		return true;
 	}
 	return false;
@@ -500,6 +525,7 @@ bool Player::playMonopoly(int resourceType){
 		for(auto& player : board.getPlayers()) {
 			addResource(resourceType, player->giveAllResources(resourceType));
 		}
+		board.discardCard(new MonopolyCard());
 		return true;
 	}
 	return false;
@@ -522,6 +548,7 @@ bool Player::playRoadBuilding(Coordinate start1, Coordinate end1, Coordinate sta
 				board.PlaceRoad(start2, end2, *this);
 			}
 			developmentCards[ROADBUILDING]--;
+			board.discardCard(new RoadBuildingCard());
 			return true;
 		}
 	}