Merge pull request #25 from Databean/trading_complete

Fixed bugs in Ankit's code, plus some refactoring.

Author: PickledMonkey

include/Deck.h

@@ -27,7 +27,7 @@ class Deck {
     void reshuffleDeck();
 
 public:
-	Deck();
+	Deck(GameBoard& board);
 	virtual ~Deck();
 
 	int getSize();

include/DevelopmentCard.h

@@ -20,93 +20,82 @@
 enum DevCardType { KNIGHT, VICTORYPOINT, YEAROFPLENTY, MONOPOLY, ROADBUILDING };
 
 
-/**
- * A card which can be held in a player's hand and be used to perform an action.
- */
+
 class DevelopmentCard {
 
-private:
-    Player* owner;
+protected:
     DevCardType type;
+    GameBoard& board;
 public:
-    DevelopmentCard(Player* player);
+    DevelopmentCard(GameBoard& board);
     virtual ~DevelopmentCard();
 
     virtual DevCardType getType() const = 0;
-    virtual void playCard() = 0;
 
-    virtual Player* getOwner();
 	virtual void accept(GameVisitor& visitor);
 	virtual bool operator==(const DevelopmentCard&);
 };
 
-/**
- * A development card used to move the robber and take a resource from another player.
- */
+
+
 class KnightCard : public DevelopmentCard {
 private:
 
 public:
-	KnightCard(Player* player);
+	KnightCard(GameBoard& board);
 //	virtual ~KnightCard();
 
     virtual DevCardType getType() const;
-    virtual void playCard();
+    void playCard(Player *player, Coordinate target);
 
 };
 
-/**
- * A development card that gives a permanent victory point on usage.
- */
+
+
 class VictoryPointCard : public DevelopmentCard {
 public:
-    VictoryPointCard(Player* player);
+    VictoryPointCard(GameBoard& board);
 //    virtual ~VictoryPointCard();
 
     virtual DevCardType getType() const;
-    virtual void playCard();
 
 };
 
-/**
- * A development card used to retrieve two resources of any type from the bank.
- */
+
 class YearOfPlentyCard : public DevelopmentCard {
 public:
-    YearOfPlentyCard(Player* player);
+    YearOfPlentyCard(GameBoard& board);
 //    virtual ~YearOfPlentyCard();
 
     virtual DevCardType getType() const;
-    virtual void playCard();
+    void playCard(Player *player, int rType1, int rType2);
 
 };
 
-/**
- * A development card used to take all resources of a particular type from all players.
- */
+
+
+
 class MonopolyCard : public DevelopmentCard {
 public:
-    MonopolyCard(Player* player);
+    MonopolyCard(GameBoard& board);
 //    virtual ~MonopolyCard();
 
     virtual DevCardType getType() const;
-    virtual void playCard();
+    void playCard(Player *player, int rType);
 
 };
 
-/**
- * A development card used to build two roads at no cost.
- */
+
+
 class RoadBuildingCard : public DevelopmentCard {
 private:
 
 public:
-	RoadBuildingCard(Player* player);
+	RoadBuildingCard(GameBoard& board);
 //	virtual ~RoadBuildingCard();
 
     virtual DevCardType getType() const;
-    virtual void playCard();
-    void playCard(Coordinate start1, Coordinate end1, Coordinate start2, Coordinate end2);
+    void playCard(Player* player, Coordinate start1, Coordinate end1, Coordinate start2, Coordinate end2);
 };
 
 

include/GameBoard.h

@@ -35,12 +35,12 @@ class GameBoard {
 	std::vector<std::unique_ptr<Player>> players;
 	Coordinate robber;
 
-	
+
     void addResource(int x, int y, resourceType res, int val);
     bool checkRolls(int* rolls);
-	
+
 	bool isValidBoard() const;
-	
+
 
 	bool verifyRoadPlacement(Coordinate start, Coordinate end, Player& Owner) const;
 	bool outOfBounds(const Coordinate& coord) const;
@@ -52,7 +52,7 @@ class GameBoard {
 
 	void removeRoadEnd(std::shared_ptr<Road> startRoad);
 	int FindLongestRoad_FromPoint(Coordinate curr, const Player & owner, std::map<Coordinate, bool>& marked, std::map<Road*, bool>& markedRoads, int length) const;
-	
+
 	void createRing(Coordinate topRight, int sideLength, std::vector<resourceType>& resources, std::vector<int>& rolls);
 	void insertTile(Coordinate location, std::vector<resourceType>& resources, std::vector<int>& rolls);
 
@@ -61,15 +61,15 @@ class GameBoard {
     void payoutResources(int roll);
 
 public:
-	GameBoard(std::vector<std::unique_ptr<Player>>&& players);
-	GameBoard(std::vector<std::unique_ptr<Player>>&& players, const std::map<Coordinate, std::pair<resourceType, int>>& resourceLocations);
+	GameBoard(const std::vector<std::string>& playerNames);
+	GameBoard(const std::vector<std::string>& playerNames, const std::map<Coordinate, std::pair<resourceType, int>>& resourceLocations);
 	GameBoard(std::istream& in);
 	GameBoard(GameBoard&) = delete;
 	~GameBoard();
 	GameBoard& operator=(GameBoard&) = delete;
-	
+
 	void save(std::ostream& out);
-	
+
 	ResourceTile& getResourceTile(Coordinate location) const;
 
 	const std::map<Coordinate, std::unique_ptr<ResourceTile>>& getResources() const;
@@ -78,7 +78,7 @@ class GameBoard {
 
 	const std::shared_ptr<Road> getRoad(Coordinate start, Coordinate end) const;
 	const std::vector<std::shared_ptr<Road>>& getRoads(Coordinate loc) const;
-	
+
 	int FindLongestRoad(const Player & owner) const;
 
 	std::vector<Settlement*> GetNeighboringSettlements(Coordinate location) const;
@@ -96,13 +96,16 @@ class GameBoard {
 	//void PlaceSettlement(Coordinate location, Player& Owner);
 	void PlaceCity(Coordinate location, Player& Owner);
 	bool PlaceRoad(Coordinate start, Coordinate end, Player& Owner);
-	
+
 	void accept(GameVisitor& visitor);
-	
+
 	bool operator==(const GameBoard& other) const;
-	
+
 	const std::vector<std::unique_ptr<Player>>& getPlayers() const;
-    
+	
+	int getNoOfPlayers();
+	Player& getPlayer(int index);
+
     bool testRollChecking(int* rolls);
 
     void moveRobber(Coordinate newRobber);

include/Player.h

@@ -27,13 +27,10 @@ const int WOOL_INDEX = 4;
 
 class DevelopmentCard;
 class Deck;
-class GameBoard;
 
 
-/**
- * One of the players interacting with the Settlers of Catan game. Contains her name, victory points,
- * development cards, and resources.
- */
+
+
 class Player {
 private:
     std::string name;
@@ -43,16 +40,17 @@ class Player {
     int armySize;
     int longestRoad;
     int victoryPoints;
-    GameBoard* board;
+    GameBoard& board;
     int resources[5];
+    int tradeModifiers[5];
 
 
-
+    void tradeWithBank(int offer[], int demand[]);
 
 public:
 
-	Player(std::string playerName);
-	Player(tinyxml2::XMLElement*);
+	Player(GameBoard& board, std::string playerName);
+	Player(GameBoard& board, tinyxml2::XMLElement*);
 	~Player();
 
     int getVictoryPoints();
@@ -66,18 +64,28 @@ class Player {
     void buyCard(std::unique_ptr<DevelopmentCard> card);
     std::string getName() const;
 
-    GameBoard* getBoard();
-    void setBoard(GameBoard* newboard);
-
-    void playCard(DevelopmentCard* card);
+//    void playCard(int index);
+//    void playCard(DevelopmentCard* card);
 
     bool canBuyRoad();
     bool buyRoad();
 
+    void setWoodModifier();
+    void setBrickModifier();
+    void setOreModifier();
+    void setWheatModifier();
+    void setWoolModifier();
+
+    void setGenralModifier();			//3:1 port
+
+    bool offerBankTrade(int offer[], int demand[]);
+
     bool offerTrade(Player* p, int offer[], int demand[]);
     bool recieveOffer(Player* p, int offer[], int demand[]);
     bool acceptOffer(Player* p, int offer[], int demand[]);
 
+    int getRandomResource();
+
     bool checkResources(int resourceList[]);
 
     int getWood() const;
@@ -92,6 +100,7 @@ class Player {
     void addWheat(int resource);
     void addWool(int resource);
 
+    int getResource(int resourceType) const; //
     void addResource(int resourceType, int delta);
 
 	void accept(GameVisitor& visitor);

include/Serialization.h

@@ -19,6 +19,8 @@ class XMLVisitor : public GameVisitor {
 	std::map<std::string, tinyxml2::XMLElement*> playerElementMap;
 	std::set<Road*> serializedRoads;
 
+	Player* lastPlayer;
+	
 	tinyxml2::XMLElement* coordinateElement(const Coordinate& c);
 public:
 	XMLVisitor();

src/Deck.cpp

@@ -11,32 +11,32 @@
 /**
  * Construct a Deck with the standard cards available in the Settlers of Catan game.
  */
-Deck::Deck()
+Deck::Deck(GameBoard& board)
 {
 	// TODO Auto-generated constructor stub
 	for(int i = 0; i < 15; i++)
 	{
-		DevelopmentCard* card = new KnightCard(NULL);
+		DevelopmentCard* card = new KnightCard(board);
 		this->deck.push_back(card);
 	}
 	for(int i = 0; i < 4; i++)
 	{
-		DevelopmentCard* card = new VictoryPointCard(NULL);
+		DevelopmentCard* card = new VictoryPointCard(board);
 		this->deck.push_back(card);
 	}
 	for(int i = 0; i < 2; i++)
 	{
-		DevelopmentCard* card = new YearOfPlentyCard(NULL);
+		DevelopmentCard* card = new YearOfPlentyCard(board);
 		this->deck.push_back(card);
 	}
 	for(int i = 0; i < 2; i++)
 	{
-		DevelopmentCard* card = new MonopolyCard(NULL);
+		DevelopmentCard* card = new MonopolyCard(board);
 		this->deck.push_back(card);
 	}
 	for(int i = 0; i < 2; i++)
 	{
-		DevelopmentCard* card = new RoadBuildingCard(NULL);
+		DevelopmentCard* card = new RoadBuildingCard(board);
 		this->deck.push_back(card);
 	}