Fixed merge conflicts

Databean · Databean · commit 0765d9a12bbd · 2014-04-12T17:54:50.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -21,3 +21,4 @@ warsofcatan
 *.wocs
 
 documentation/*
+/Debug
diff --git a/include/City.h b/include/City.h
@@ -7,20 +7,20 @@
  * Upgraded from a Settlement. Exists on the board, and receives two resources from adjacent tiles when their number is rolled.
  */
 class City : public CornerPiece {
-private:
+	private:
 
-public:
-	City(GameBoard& board, Coordinate location, Player& owner);
-	City(City&) = delete;
-	~City();
-	City(CornerPiece& sett);
-	City& operator=(City&) = delete;
-	
-	virtual void accept(GameVisitor&);
-	virtual bool operator==(const GamePiece& piece) const;
+	public:
+		City(GameBoard& board, Coordinate location, Player& owner);
+		City(City&) = delete;
+		~City();
+		City(CornerPiece& sett);
+		City& operator=(City&) = delete;
 
-	int getResourceModifier();
-	int getVictoryPoints();
+		virtual void accept(GameVisitor&);
+		virtual bool operator==(const GamePiece& piece) const;
+	
+		int getResourceModifier();
+		int getVictoryPoints();
 };
 
 #endif
diff --git a/include/CornerPiece.h b/include/CornerPiece.h
@@ -20,9 +20,13 @@ class CornerPiece : public GamePiece {
 	Player& getOwner();
 	const Player& getOwner() const;
 
+	virtual void accept(GameVisitor& visitor)=0;
+
 	virtual int getResourceModifier();
 
 	virtual int getVictoryPoints();
+
+	virtual bool operator==(const GamePiece&) const;
 };
 
 #endif
diff --git a/include/GameBoard.h b/include/GameBoard.h
@@ -88,13 +88,14 @@ class GameBoard {
 
 	void PlaceSettlement(Coordinate location, Player& Owner);
 	void UpgradeSettlement(Coordinate location);
-	//void PlaceRoad(Coordinate start, Coordinate end, Player& Owner);
+	void UpgradeToWonder(Coordinate location);
 
 
 	bool buyRoad(Coordinate start, Coordinate end, Player& Owner);
 
 	//void PlaceSettlement(Coordinate location, Player& Owner);
 	void PlaceCity(Coordinate location, Player& Owner);
+	void PlaceWonder(Coordinate location, Player& Owner);
 	bool PlaceRoad(Coordinate start, Coordinate end, Player& Owner);
 
 	void accept(GameVisitor& visitor);
diff --git a/include/GameView.h b/include/GameView.h
@@ -86,6 +86,7 @@ class DrawingGameVisitor : public GameVisitor {
 	virtual void visit(Player&);
 	virtual void visit(ResourceTile&);
 	virtual void visit(DevelopmentCard&);
+	virtual void visit(Wonder&);
 };
 
 /**
@@ -200,4 +201,4 @@ class TradingView : public ViewElement {
 	void render();
 };
 
-#endif
+#endif
diff --git a/include/GameVisitor.h b/include/GameVisitor.h
@@ -8,6 +8,7 @@ class Road;
 class City;
 class Player;
 class DevelopmentCard;
+class Wonder;
 
 /**
  * A class to be extended with callbacks to handle the different classes in the model. 
@@ -28,6 +29,7 @@ class GameVisitor {
 	virtual void visit(Player&) = 0;
 	virtual void visit(ResourceTile&) = 0;
 	virtual void visit(DevelopmentCard&) = 0;
+	virtual void visit(Wonder&) = 0;
 };
 
-#endif
+#endif
diff --git a/include/Player.h b/include/Player.h
@@ -54,30 +54,45 @@ class Player {
 	Player(GameBoard& board, tinyxml2::XMLElement*);
 	~Player();
 
+	int getArmySize();
+	int getLongestRoad();
     int getVictoryPoints();
+
     void updateVictoryPoints();
 
     int getVictoryPointsWithoutCards();
     int getVictoryPointCards();
 
     int getDevCardsInHand();
 
-    void buyCard(std::unique_ptr<DevelopmentCard> card);
     std::string getName() const;
 
 //    void playCard(int index);
 //    void playCard(DevelopmentCard* card);
 
     bool canBuyRoad();
     bool buyRoad();
-
+    bool canBuySettlement();
+    bool buySettlement();
+    bool canBuyCity();
+    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(std::array<int, 5> offer, std::array<int, 5> demand);
 
@@ -98,10 +113,15 @@ class Player {
     void addOre(int resource);
     void addWheat(int resource);
     void addWool(int resource);
+    void addMultiple(int wood, int brick, int ore, int wheat, int wool);
 
     int getResource(int resourceType) const; //
     void addResource(int resourceType, int delta);
 
+    bool validateResourceAmount(int wood, int brick, int ore, int wheat, int wool);
+    bool validateTradeModifiers(int wood, int brick, int ore, int wheat, int wool);
+
+
 	void accept(GameVisitor& visitor);
 	bool operator==(const Player& player) const;
 };
diff --git a/include/Serialization.h b/include/Serialization.h
@@ -33,10 +33,11 @@ class XMLVisitor : public GameVisitor {
 	virtual void visit(Player&);
 	virtual void visit(ResourceTile&);
 	virtual void visit(DevelopmentCard&);
+	virtual void visit(Wonder&);
 	
 	const tinyxml2::XMLDocument& getXMLDoc() const;
 };
 
 Coordinate xmlElementToCoord(const tinyxml2::XMLElement& element);
 
-#endif
+#endif
diff --git a/include/Wonder.h b/include/Wonder.h
@@ -0,0 +1,31 @@
+/*
+ * Wonder.h
+ *
+ *  Created on: Apr 10, 2014
+ *      Author: Kyle Grage
+ */
+
+#ifndef WONDER_H_
+#define WONDER_H_
+
+#include "CornerPiece.h"
+
+class Wonder : public CornerPiece {
+	private:
+
+	public:
+		Wonder(GameBoard& board, Coordinate location, Player& owner);
+		Wonder(Wonder&) = delete;
+		~Wonder();
+		Wonder(CornerPiece& sett);
+		Wonder& operator=(City&) = delete;
+
+		virtual void accept(GameVisitor&);
+		virtual bool operator==(const GamePiece& piece) const;
+
+		int getResourceModifier();
+		int getVictoryPoints();
+
+};
+
+#endif /* WONDER_H_ */
diff --git a/src/City.cpp b/src/City.cpp
@@ -20,7 +20,6 @@ City::~City() {
 }
 
 /**
- * 
  * @param visitor The visiting member.
  */
 void City::accept(GameVisitor& visitor) {
@@ -29,11 +28,16 @@ void City::accept(GameVisitor& visitor) {
 
 /**
  * Test for equality with another game piece.
- * @param p The piece to test with
+ * @param other The piece to test with
  * @return True if this object is equal to the other, false if not.
  */
-bool City::operator==(const GamePiece& p) const {
-	return false; //TODO: Actually compare.
+bool City::operator==(const GamePiece& other) const {
+	auto city = dynamic_cast<const City*>(&other);
+	if(city) {
+		return getOwner().getName() == city->getOwner().getName() && getLocation() == city->getLocation();
+	} else {
+		return false;
+	}
 }
 
 /**
@@ -49,7 +53,7 @@ int City::getResourceModifier() {
  * @return The victory points the player gets from the city.
  */
 int City::getVictoryPoints() {
-	return 2; //TODO: implement robber check here
+	return 2;
 }
 
 /**
@@ -59,3 +63,5 @@ int City::getVictoryPoints() {
 City::City(CornerPiece& sett) : CornerPiece(sett.getBoard(), sett.getLocation(), sett.getOwner()) {
 
 }
+
+
diff --git a/src/CornerPiece.cpp b/src/CornerPiece.cpp
@@ -47,4 +47,17 @@ int CornerPiece::getVictoryPoints() {
  */
 int CornerPiece::getResourceModifier() {
 	return 0;
-}
+}
+
+/**
+ * Determines if a piece is the same
+ * @return boolean
+ */
+bool CornerPiece::operator==(const GamePiece& other) const {
+	auto cp = dynamic_cast<const CornerPiece*>(&other);
+	if(cp) {
+		return getOwner().getName() == cp->getOwner().getName() && getLocation() == cp->getLocation();
+	} else {
+		return false;
+	}
+}
diff --git a/src/GameBoard.cpp b/src/GameBoard.cpp
@@ -14,7 +14,9 @@
 
 #include "CornerPiece.h"
 
+#include "Settlement.h"
 #include "City.h"
+#include "Wonder.h"
 
 using std::shared_ptr;
 using std::random_shuffle;
@@ -199,7 +201,7 @@ GameBoard::GameBoard(istream& in) {
 				}
 			}
 			if(owner == nullptr) {
-				throw std::runtime_error("Road is owned by a nonexistant player.");
+				throw std::runtime_error("Settlement is owned by a nonexistant player.");
 			}
 			PlaceSettlement(location, *owner);
 		}
@@ -218,7 +220,26 @@ GameBoard::GameBoard(istream& in) {
 				}
 			}
 			if(owner == nullptr) {
-				throw std::runtime_error("Road is owned by a nonexistant player.");
+				throw std::runtime_error("City is owned by a nonexistant player.");
+			}
+			PlaceCity(location, *owner);
+		}
+	}
+
+	auto wonderElements = doc.RootElement()->FirstChildElement("wonders");
+	if(wonderElements) {
+		for(auto wonderElement = wonderElements->FirstChildElement(); wonderElement; wonderElement = wonderElement->NextSiblingElement()) {
+			Coordinate location = xmlElementToCoord(*(wonderElement->FirstChildElement("coordinate")));
+
+			std::string ownerName = wonderElement->FirstChildElement("owner")->FirstChild()->Value();
+			Player* owner = nullptr;
+			for(auto& playerUnique : players) {
+				if(playerUnique->getName() == ownerName) {
+					owner = playerUnique.get();
+				}
+			}
+			if(owner == nullptr) {
+				throw std::runtime_error("Wonder is owned by a nonexistant player.");
 			}
 			PlaceCity(location, *owner);
 		}
@@ -587,13 +608,32 @@ void GameBoard::PlaceCity(Coordinate location, Player& Owner){
 
 }
 
+/**
+ * Place a city on the board.
+ * @param location Where to place it on the board.
+ * @param Owner The player placing the city.
+ */
+void GameBoard::PlaceWonder(Coordinate location, Player& Owner){
+	corners[location] = std::unique_ptr<CornerPiece>(new Wonder(*this, location, Owner));
+
+}
+
 /**
  * Upgrade a settlement to a city.
  * @param location Where the settlement being upgraded is.
  */
 void GameBoard::UpgradeSettlement(Coordinate location){
 	if(corners.find(location) != corners.end())
-	corners[location] = std::unique_ptr<CornerPiece>(new City(*corners[location])); //TODO test for memory leak
+		corners[location] = std::unique_ptr<CornerPiece>(new City(*corners[location])); //TODO test for memory leak
+}
+
+/**
+ * Upgrade a settlement to a city.
+ * @param location Where the settlement being upgraded is.
+ */
+void GameBoard::UpgradeToWonder(Coordinate location){
+	if(corners.find(location) != corners.end())
+		corners[location] = std::unique_ptr<CornerPiece>(new Wonder(*corners[location])); //TODO test for memory leak
 }
 
 /**
diff --git a/src/GameView.cpp b/src/GameView.cpp
@@ -9,6 +9,7 @@
 #include "GameController.h"
 #include "Renderer.h"
 #include "City.h"
+#include "Wonder.h"
 
 using std::make_pair;
 using std::pair;
@@ -394,6 +395,25 @@ void DrawingGameVisitor::visit(City& city) {
 	glEnd();
 }
 
+/**
+ * Draw a wonder. Right now is just a square.
+ * @param wonder The city to draw.
+ */
+void DrawingGameVisitor::visit(Wonder& wonder) {
+	static const auto wonderRadius = 0.06;
+
+	auto centerScreenPos = coordToScreen(wonder.getLocation());
+
+	glBindTexture(GL_TEXTURE_2D, 0);
+	glColor3d(0., 0., 0.);
+	glBegin(GL_QUADS);
+	glVertex2d(centerScreenPos.first + wonderRadius, centerScreenPos.second + wonderRadius);
+	glVertex2d(centerScreenPos.first + wonderRadius, centerScreenPos.second - wonderRadius);
+	glVertex2d(centerScreenPos.first - wonderRadius, centerScreenPos.second - wonderRadius);
+	glVertex2d(centerScreenPos.first - wonderRadius, centerScreenPos.second + wonderRadius);
+	glEnd();
+}
+
 /**
  * Draw a player.
  * @param player The player to draw.
diff --git a/src/Player.cpp b/src/Player.cpp
diff --git a/src/Serialization.cpp b/src/Serialization.cpp
diff --git a/src/Wonder.cpp b/src/Wonder.cpp
diff --git a/tests/testSerialization.cpp b/tests/testSerialization.cpp
diff --git a/tests/test_CornerPiece.cpp b/tests/test_CornerPiece.cpp
diff --git a/tests/test_Player.cpp b/tests/test_Player.cpp

Original file line number	Diff line number	Diff line change
`@@ -21,3 +21,4 @@ warsofcatan`
`21`	`21`	`*.wocs`
`22`	`22`
`23`	`23`	`documentation/*`
	`24`	`+/Debug`