Added functionality for discarding cards

Author: PickledMonkey

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;

src/GameBoard.cpp

@@ -14,7 +14,6 @@
 
 #include "CornerPiece.h"
 #include "GameDice.h"
-
 #include "Settlement.h"
 #include "City.h"
 #include "Wonder.h"
@@ -997,3 +996,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/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;
 }
@@ -261,7 +286,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()
 {
@@ -479,6 +504,7 @@ bool Player::playYearOfPlenty(int resourceType){
 	if(developmentCards[YEAROFPLENTY] > 0){
 		developmentCards[YEAROFPLENTY]--;
 		addResource(resourceType, 2);
+		board.discardCard(new YearOfPlentyCard());
 		return true;
 	}
 	return false;
@@ -498,6 +524,7 @@ bool Player::playMonopoly(int resourceType){
 		for(auto& player : board.getPlayers()) {
 			addResource(resourceType, player->giveAllResources(resourceType));
 		}
+		board.discardCard(new MonopolyCard());
 		return true;
 	}
 	return false;
@@ -520,6 +547,7 @@ bool Player::playRoadBuilding(Coordinate start1, Coordinate end1, Coordinate sta
 				board.PlaceRoad(start2, end2, *this);
 			}
 			developmentCards[ROADBUILDING]--;
+			board.discardCard(new RoadBuildingCard());
 			return true;
 		}
 	}

tests/test_GameBoard.cpp

@@ -348,7 +348,21 @@ TEST(canRobberRob){
 }
 **/
 
+TEST(buyCard){
+	GameBoard test_board({"tester1"});
+	Player& test_player = test_board.getPlayer(0);
+
+	CHECK(test_player.getDevCardsInHand() == 0);
+	test_board.buyCard(test_player);
+	CHECK(test_player.getDevCardsInHand() == 0);
 
+	test_player.addOre(1);
+	test_player.addWheat(1);
+	test_player.addWool(1);
+
+	test_board.buyCard(test_player);
+	CHECK(test_player.getDevCardsInHand() == 1);
+}