Merge remote-tracking branch 'origin/Player' into serialization

Conflicts:
	include/GameBoard.h
	include/Player.h
	src/Player.cpp

Author: Databean

include/Player.h

@@ -18,14 +18,18 @@
 
 #include "GameVisitor.h"
 
-//#include "DevelopmentCard.h"
+const int WOOD_INDEX = 0;
+const int BRICK_INDEX = 1;
+const int ORE_INDEX = 2;
+const int WHEAT_INDEX = 3;
+const int WOOL_INDEX = 4;
 
 
 class DevelopmentCard;
 class Deck;
 
-//#include <ext/hash_map>
-//#include <unordered_map>
+
+
 
 class Player {
 private:
@@ -36,10 +40,12 @@ class Player {
     int armySize;
     int longestRoad;
     int victoryPoints;
-
+//    GameBoard *board;
     int resources[5];
 
 
+
+
 public:
 
 	Player(std::string playerName);
@@ -49,13 +55,23 @@ class Player {
     int getVictoryPoints();
     void updateVictoryPoints();
 
+    int getVictoryPointsWithoutCards();
+    int getVictoryPointCards();
+
     int getDevCardsInHand();
 
     void buyCard(std::unique_ptr<DevelopmentCard> card);
     std::string getName() const;
 
     void playCard(DevelopmentCard* card);
 
+    bool offerTrade(Player* p, int offer[], int demand[]);
+    bool recieveOffer(Player* p, int offer[], int demand[]);
+    bool acceptOffer(Player* p, int offer[], int demand[]);
+
+    bool checkResources(int resourceList[]);
+
+
     int getWood() const;
     int getBrick() const;
     int getOre() const;

src/Player.cpp

@@ -56,10 +56,13 @@ Player::Player(XMLElement* elem)
 		}
 		developmentCards.emplace_back(typeIt->second());
 	}
+	armySize = 0;
+	longestRoad = 0;
+	victoryPoints = 0;
 }
 
 Player::~Player() {
-	
+
 }
 
 int Player::getDevCardsInHand()
@@ -73,6 +76,18 @@ void Player::updateVictoryPoints()
     //TODO: Calculate and Update victory points
 }
 
+int Player::getVictoryPointsWithoutCards()
+{
+    updateVictoryPoints();
+    return victoryPoints - getVictoryPointCards();
+}
+
+int Player::getVictoryPointCards()
+{
+	//TODO:write function
+	return 0;
+}
+
 int Player::getVictoryPoints()
 {
     updateVictoryPoints();
@@ -99,56 +114,134 @@ void Player::playCard(DevelopmentCard *card)
     std::remove_if(developmentCards.begin(), developmentCards.end(), cardTester);
 }
 
+bool Player::offerTrade(Player* p, int offer[], int demand[])
+{
+	if(sizeof offer/sizeof(int) != 5 || sizeof demand/sizeof(int) != 5)
+		return false; //Invalid Trade
+
+	if(!this->checkResources(offer))
+		return false; //YOu dont have enough to offer this
+
+	return p->recieveOffer(this, offer, demand);
+}
+
+bool Player::recieveOffer(Player* p, int offer[], int demand[])
+{
+	if( !this->checkResources(demand) )
+		return false;
+
+	bool input = true;
+
+	//TODO:Display Offer to User and wait for input
+
+	if(input)
+	{
+		this->acceptOffer(p, offer, demand);
+		return true;
+	}
+	else
+		return false;
+
+}
+
+
+bool Player::acceptOffer(Player* p, int offer[], int demand[])
+{
+	p->setWood(demand[WOOD_INDEX] - offer[WOOD_INDEX]);
+	p->setBrick(demand[BRICK_INDEX] - offer[BRICK_INDEX]);
+	p->setOre(demand[ORE_INDEX] - offer[ORE_INDEX]);
+	p->setWheat(demand[WHEAT_INDEX] - offer[WHEAT_INDEX]);
+	p->setWool(demand[WOOL_INDEX] - offer[WOOL_INDEX]);
+
+	this->setWood(offer[WOOD_INDEX] - demand[WOOD_INDEX]);
+	this->setBrick(offer[BRICK_INDEX] - demand[BRICK_INDEX]);
+	this->setOre(offer[ORE_INDEX] - demand[ORE_INDEX]);
+	this->setWheat(offer[WHEAT_INDEX] - demand[WHEAT_INDEX]);
+	this->setWool(offer[WOOL_INDEX] - demand[WOOL_INDEX]);
+
+	return true;
+}
+
+
+
+
+
+bool Player::checkResources(int resourceList[5])
+{
+	for(int i = 0; i < 5; i++)
+	{
+		if(resourceList[i] > resources[i] || resourceList[i] < 0)
+			return false;
+	}
+	return true;
+}
+
+
 int Player::getWood() const
 {
-    return resources[0];
+    return resources[WOOD_INDEX];
 }
 
 int Player::getBrick() const
 {
-    return resources[1];
+    return resources[BRICK_INDEX];
 }
 
 int Player::getOre() const
 {
-    return resources[2];
+    return resources[ORE_INDEX];
 }
 
 int Player::getWheat() const
 {
-    return resources[3];
+    return resources[WHEAT_INDEX];
 }
 
 int Player::getWool() const
 {
-    return resources[4];
+    return resources[WOOL_INDEX];
 }
 
 
 
 void Player::setWood(int resource)
 {
-    resources[0] = resource;
+	if(resources[WOOD_INDEX] < (0-resource))
+		resources[WOOD_INDEX] = 0;
+	else
+		resources[WOOD_INDEX] += resource;
 }
 
 void Player::setBrick(int resource)
 {
-    resources[1] = resource;
+	if(resources[BRICK_INDEX] < (0-resource))
+			resources[BRICK_INDEX] = 0;
+	else
+		resources[BRICK_INDEX] += resource;
 }
 
 void Player::setOre(int resource)
 {
-    resources[2] = resource;
+	if(resources[ORE_INDEX] < (0-resource))
+			resources[ORE_INDEX] = 0;
+	else
+		resources[ORE_INDEX] += resource;
 }
 
 void Player::setWheat(int resource)
 {
-    resources[3] = resource;
+	if(resources[WHEAT_INDEX] < (0-resource))
+		resources[WHEAT_INDEX] = 0;
+	else
+		resources[WHEAT_INDEX] += resource;
 }
 
 void Player::setWool(int resource)
 {
-    resources[4] = resource;
+	if(resources[WOOL_INDEX] < (0-resource))
+		resources[WOOL_INDEX] = 0;
+	else
+		resources[WOOL_INDEX] += resource;
 }
 
 std::string Player::getName() const