added tests, victory screen

Author: ankit21

include/GameBoard.h

@@ -43,8 +43,8 @@ class GameBoard {
 	Coordinate robber;
 
 	int currentTurn;
-
 	int maxVictoryPoints;
+	int winner;
 
     void addResource(int x, int y, resourceType res, int val);
     bool checkRolls(int* rolls);
@@ -92,6 +92,7 @@ class GameBoard {
 
 	void endTurn();
 	Player& getCurrentPlayer() const;
+	Player& getWinner() const;
 
 	int getMaxVictoryPoints();
 	void setMaxVictoryPoints(int maxVicPts);

src/GameBoard.cpp

@@ -40,6 +40,8 @@ GameBoard::GameBoard(const vector<std::string>& playerNames) {
 	}
 
 	currentTurn = 0;
+	maxVictoryPoints = 10;
+	winner = -1;
 
 	std::srand(std::time(0));
 
@@ -126,6 +128,8 @@ GameBoard::GameBoard(const std::vector<std::string>& playerNames, const std::map
 		throw std::runtime_error("Board is invalid.");
 	}
 	currentTurn = 0;
+	maxVictoryPoints = 10;
+	winner = -1;
 }
 
 GameDice GameBoard::getDice() {
@@ -259,7 +263,9 @@ GameBoard::GameBoard(istream& in) {
 		throw std::runtime_error("Board is invalid.");
 	}
 
-	currentTurn = 0; //have to update <<--
+	currentTurn = 0; 		//have to update
+	maxVictoryPoints = 0;
+	winner = -1;
 }
 
 /**
@@ -321,7 +327,10 @@ ResourceTile& GameBoard::getResourceTile(Coordinate location) const
 void GameBoard::endTurn()
 {
 	if(getCurrentPlayer().getVictoryPoints() >= getMaxVictoryPoints())
-		std::cout<<"GG Bitches";
+	{
+		//std::cout<<"GG Bitches";
+		winner = currentTurn;
+	}
 
 	currentTurn++;
 	if(currentTurn >= getNoOfPlayers())
@@ -1048,6 +1057,19 @@ Player& GameBoard::getCurrentPlayer() const
 	return *players[currentTurn];
 }
 
+
+/**
+ * @return reference to the winner if there is one, null otherwise
+ */
+Player& GameBoard::getWinner() const
+{
+	if(winner != -1 && winner < players.size())
+		return *players[winner];
+
+	return nullptr;
+}
+
+
 /**
  * @return no of players
  */

src/GameView.cpp

@@ -163,6 +163,9 @@ void GameView::render() {
 	drawCardCount(font, fontSize);
 	drawResourceCount(font, fontSize);
 
+	if(model.getWinner != nullptr)
+			renderText(font, fontSize, {.2, .4}, {.8, .6}, model.getWinner().getName() + " Wins");
+
 	glFlush();
 }
 

tests/test_Player.cpp

@@ -368,3 +368,127 @@ TEST(PlayerTest, UpdateVictoryPoints_all){
 }
 
 
+//INSERT DEV CARD TESTS HERE
+
+TEST(Monopoly_card_1){
+	GameBoard board({"test-player1", "test-player2"});
+
+	Player& tp1 = board.getPlayer(0);
+	Player& tp2 = board.getPlayer(1);
+
+	tp1.addMultiple(1,1,1,0,0);
+
+	std::unique_ptr<DevelopmentCard> test_MonopolyCard = std::unique_ptr<DevelopmentCard>(new MonopolyCard());
+	tp1.buyCard(test_MonopolyCard);
+
+
+	tp1.addMultiple(5,5,5,5,5);
+	tp2.addMultiple(5,5,5,5,5);
+
+	tp1.playMonopoly(2);
+
+	CHECK(validateResourceAmount(5,5,10,5,5,tp1));
+	CHECK(validateResourceAmount(5,5,0,5,5,tp2));
+
+}
+
+
+TEST(Monopoly_card_2){
+	GameBoard board({"test-player1", "test-player2"});
+
+	Player& tp1 = board.getPlayer(0);
+	Player& tp2 = board.getPlayer(1);
+
+	tp1.addMultiple(1,1,1,0,0);
+
+	std::unique_ptr<DevelopmentCard> test_MonopolyCard = std::unique_ptr<DevelopmentCard>(new MonopolyCard());
+	tp1.buyCard(test_MonopolyCard);
+
+	tp1.addMultiple(0,0,0,1,1);
+	tp2.addMultiple(1,1,0,0,0);
+
+	tp1.playMonopoly(2);
+
+	CHECK(validateResourceAmount(0,0,0,1,1,tp1));
+	CHECK(validateResourceAmount(1,1,0,0,0,tp2));
+
+}
+
+TEST(Monopoly_card_false){
+	GameBoard board({"test-player1", "test-player2"});
+
+	Player& tp1 = board.getPlayer(0);
+	Player& tp2 = board.getPlayer(1);
+
+	tp1.addMultiple(0,0,0,1,1);
+	tp2.addMultiple(1,1,0,0,0);
+
+	tp1.playMonopoly(0);
+
+	CHECK(validateResourceAmount(0,0,0,1,1,tp1));
+	CHECK(validateResourceAmount(1,1,0,0,0,tp2));
+
+}
+
+
+TEST(Year_Of_Plenty_card){
+	GameBoard board({"test-player1"});
+
+	Player& tp1 = board.getPlayer(0);
+
+	tp1.addMultiple(1,1,1,0,0);
+
+	std::unique_ptr<DevelopmentCard> test_YearOfPlentyCard = std::unique_ptr<DevelopmentCard>(new YearOfPlentyCard());
+	tp1.buyCard(test_YearOfPlentyCard);
+
+	tp1.addMultiple(0,0,0,1,1);
+
+	tp1.playYearOfPlenty(2);
+
+	CHECK(validateResourceAmount(0,0,2,1,1,tp1));
+
+}
+
+
+
+//INSERT TRADING TESTS HERE
+
+TEST(Trade_positive){
+	GameBoard board({"test-player1", "test-player2"});
+
+	Player& tp1 = board.getPlayer(0);
+	Player& tp2 = board.getPlayer(1);
+
+	tp1.addMultiple(5,5,5,5,5);
+	tp2.addMultiple(5,5,5,5,5);
+
+	std::array<int, 5> offer = {{2,2,0,0,0}};
+	std::array<int, 5> demand = {{0,0,0,2,2}};
+
+	tp2.acceptOffer(tp1, offer, demand);
+
+	CHECK(validateResourceAmount(3,3,5,7,7,tp1));
+	CHECK(validateResourceAmount(7,7,5,3,3,tp2));
+
+}
+
+
+TEST(Trade_negative){
+	GameBoard board({"test-player1", "test-player2"});
+
+	Player& tp1 = board.getPlayer(0);
+	Player& tp2 = board.getPlayer(1);
+
+	tp1.addMultiple(2,2,2,2,2);
+	tp2.addMultiple(2,2,2,2,2);
+
+	std::array<int, 5> offer = {{5,5,0,0,0}};
+	std::array<int, 5> demand = {{0,0,0,5,5}};
+
+	tp2.acceptOffer(tp1, offer, demand);
+
+	CHECK(validateResourceAmount(2,2,2,2,2,tp1));
+	CHECK(validateResourceAmount(2,2,2,2,2,tp2));
+
+}
+