Updates to player class & test_Player partially implemented

Author: Kyle Grage

include/Player.h

@@ -53,7 +53,10 @@ class Player {
 	Player(GameBoard& board, tinyxml2::XMLElement*);
 	~Player();
 
+	int getArmySize();
+	int getLongestRoad();
     int getVictoryPoints();
+
     void updateVictoryPoints();
 
     int getVictoryPointsWithoutCards();
@@ -75,14 +78,21 @@ class Player {
     bool buyCity();
     bool canBuyWonder();
     bool buyWonder();
+    bool canBuyCard();
+    bool buyCard();
 
+    int getWoodModifier();
     void setWoodModifier();
+    int getBrickModifier();
     void setBrickModifier();
+    int getOreModifier();
     void setOreModifier();
+    int getWheatModifier();
     void setWheatModifier();
+    int getWoolModifier();
     void setWoolModifier();
 
-    void setGenralModifier();			//3:1 port
+    void setGeneralModifier();			//3:1 port
 
     bool offerBankTrade(int offer[], int demand[]);
 

src/Player.cpp

@@ -117,7 +117,7 @@ bool Player::buyRoad(){
 
 /**
  * Determine if the player has enough resources to buy a settlement.
- * @return True if the player has enough resources to buy a road, false otherwise
+ * @return True if the player has enough resources to buy a settlement, false otherwise
  */
 bool Player::canBuySettlement(){
 	return getWood() >= 1 && getBrick() >= 1 && getWheat() >= 1 && getWool() >= 1;
@@ -137,7 +137,7 @@ bool Player::buySettlement(){
 
 /**
  * Determine if the player has enough resources to buy a city.
- * @return True if the player has enough resources to buy a road, false otherwise
+ * @return True if the player has enough resources to buy a city, false otherwise
  */
 bool Player::canBuyCity(){
 	return getWheat() >= 2 && getOre() >= 3;
@@ -156,7 +156,7 @@ bool Player::buyCity(){
 
 /**
  * Determine if the player has enough resources to buy a wonder.
- * @return True if the player has enough resources to buy a road, false otherwise
+ * @return True if the player has enough resources to buy a wonder, false otherwise
  */
 bool Player::canBuyWonder(){
 	return getWood() >= 5 && getBrick() >= 5 && getWheat() >= 5 && getWool() >= 5 && getOre() >= 5;
@@ -174,6 +174,26 @@ bool Player::buyWonder(){
 	return false;
 }
 
+/**
+ * Determine if the player has enough resources to buy a card.
+ * @return True if the player has enough resources to buy a card, false otherwise
+ */
+bool Player::canBuyCard(){
+	return getWheat() >= 1 && getWool() >= 1 && getOre() >= 1;
+}
+
+/**
+ * Subtracts the cost of a card from a player's resources if they have enough
+ * @return true if the resources were subtracted, false otherwise
+ */
+bool Player::buyCard(){
+	if(canBuySettlement()){
+		addMultiple(0,0,-1,-1,-1);
+		return true;
+	}
+	return false;
+}
+
 
 
 /**
@@ -212,6 +232,14 @@ int Player::getVictoryPointCards()
 	return retVal;
 }
 
+int Player::getArmySize(){
+	return armySize;
+}
+
+int Player::getLongestRoad(){
+	return longestRoad;
+}
+
 
 /**
  * The number of victory points a player has.
@@ -226,9 +254,13 @@ int Player::getVictoryPoints()
  * Acquire a development card.
  * @param card An owning pointer to the card the player acquired.
  */
-void Player::buyCard(std::unique_ptr<DevelopmentCard> card)
+void Player::buyCard(std::unique_ptr<DevelopmentCard> card);
 {
-    developmentCards.push_back(std::move(card));
+	if(canBuyCard()){
+		buyCard();
+		developmentCards.push_back(std::move(card));
+	}
+
 }
 
 
@@ -257,6 +289,13 @@ void Player::buyCard(std::unique_ptr<DevelopmentCard> card)
 //    std::remove_if(developmentCards.begin(), developmentCards.end(), cardTester);
 //}
 
+/**
+ * Gets the current modifier for trading wood
+ * @return int, the trading value for wood
+ */
+int Player::getWoodModifier(){
+	return tradeModifiers[WOOD_INDEX];
+}
 
 /**
  * Sets the trade modifier for Wood to 2:1
@@ -266,6 +305,14 @@ void Player::setWoodModifier()
 	tradeModifiers[WOOD_INDEX] = 2;
 }
 
+/**
+ * Gets the current modifier for trading brick
+ * @return int, the trading value for brick
+ */
+int Player::getBrickModifier(){
+	return tradeModifiers[BRICK_INDEX];
+}
+
 /**
  * Sets the trade modifier for Brick to 2:1
  */
@@ -274,6 +321,14 @@ void Player::setBrickModifier()
 	tradeModifiers[BRICK_INDEX] = 2;
 }
 
+/**
+ * Gets the current modifier for trading ore
+ * @return int, the trading value for ore
+ */
+int Player::getOreModifier(){
+	return tradeModifiers[ORE_INDEX];
+}
+
 /**
  * Sets the trade modifier for Ore to 2:1
  */
@@ -282,6 +337,14 @@ void Player::setOreModifier()
 	tradeModifiers[ORE_INDEX] = 2;
 }
 
+/**
+ * Gets the current modifier for trading wheat
+ * @return int, the trading value for wheat
+ */
+int Player::getWheatModifier(){
+	return tradeModifiers[WHEAT_INDEX];
+}
+
 /**
  * Sets the trade modifier for Wheat to 2:1
  */
@@ -290,6 +353,14 @@ void Player::setWheatModifier()
 	tradeModifiers[WHEAT_INDEX] = 2;
 }
 
+/**
+ * Gets the current modifier for trading wool
+ * @return int, the trading value for wool
+ */
+int Player::getWoolModifier(){
+	return tradeModifiers[WOOL_INDEX];
+}
+
 /**
  * Sets the trade modifier for Wool to 2:1
  */
@@ -301,7 +372,7 @@ void Player::setWoolModifier()
 /**
  * Sets the trade modifier for all resources to 3:1
  */
-void Player::setGenralModifier()
+void Player::setGeneralModifier()
 {
 	for(int i =0; i<5; i++)
 	{