Merge branch 'master' into moreSoftConfig

Author: Databean

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,8 @@ class GameBoard {
 
 	void endTurn();
 	Player& getCurrentPlayer() const;
+	bool hasWinner();
+	Player& getWinner() const;
 
 	int getMaxVictoryPoints();
 	void setMaxVictoryPoints(int maxVicPts);
@@ -120,6 +122,9 @@ class GameBoard {
 	bool canUpgradeSettlement(Coordinate location, const Player& owner) const;
 	bool buyUpgradeOnSettlement(Coordinate location, Player& owner);
 
+	bool canUpgradeToWonder(Coordinate location, const Player& owner) const;
+	bool buyUpgradeOnWonder(Coordinate location, Player& owner);
+
 	//void PlaceSettlement(Coordinate location, Player& Owner);
 	void PlaceCity(Coordinate location, Player& Owner);
 	void PlaceWonder(Coordinate location, Player& Owner);

include/GameController.h

@@ -12,7 +12,7 @@ class GameView;
 class Player;
 
 
-enum ControlState {BASESTATE, MODALSTATE, BUILDROAD, BUILDSETTLEMENT, BUILDCITY, ROBBER,
+enum ControlState {BASESTATE, MODALSTATE, BUILDROAD, BUILDSETTLEMENT, BUILDCITY, BUILDWONDER, ROBBER,
 	VICTORYPOINT_DEVCARD, BUILDROAD_DEVCARD, KNIGHT_DEVCARD, YEAROFPLENTY_DEVCARD, MONOPOLY_DEVCARD};
 
 
@@ -39,6 +39,7 @@ class GameController {
 	bool handleRoadButtonEvent(ScreenCoordinate);
 	bool handleSettlementButtonEvent(ScreenCoordinate);
 	bool handleCityButtonEvent(ScreenCoordinate);
+	bool handleWonderButtonEvent(ScreenCoordinate);
 	bool handleRoadCardButtonEvent(ScreenCoordinate);
 
 	bool handleBuyDevelopmentCardButtonEvent(ScreenCoordinate);
@@ -57,13 +58,15 @@ class GameController {
 
 	bool handleConfirmRoadCard(ScreenCoordinate);
 	bool handleCancelDialogueEvent(ScreenCoordinate);
+    
+    bool viewCardTotals(ScreenCoordinate coord);
 
 	void pushState(ControlState);
 	ControlState getState();
 	ControlState popState();
 	void storeClick(Coordinate clickCoordinate);
 	Coordinate getLastClick();
-	Coordinate getPastClick(int howLongAgo);
+	Coordinate getPastClick(unsigned int howLongAgo);
 	void clearClickHistory();
 	bool hasClickHistory();
 	int getClickHistorySize();
@@ -72,6 +75,8 @@ class GameController {
 
 	bool handlePlayerClick(ScreenCoordinate, Player&);
 	bool handleTradeOffer(ScreenCoordinate, Player& initiating, std::array<int, 5>, Player& receiving, std::array<int, 5>);
+	
+	bool handleBankClick(ScreenCoordinate);
 };
 
 #endif

include/GameDice.h

@@ -11,6 +11,8 @@ class GameDice {
 	int first;
 	int second;
 public:
+	GameDice();
+	
 	int roll();
 	int getFirst() const;
 	int getSecond() const;

include/GameView.h

@@ -52,13 +52,12 @@ class GameView {
 	std::vector<ScreenCoordinate> pointsOfInterest;
 
 	void highlightPoint(ScreenCoordinate & coord);
-	void drawCardCount(std::string font, int fontSize);
-	void drawResourceCount(std::string font, int fontSize);
 
 	std::string controlStateText;
 
 	GameView(const GameView& o) = delete;
 	GameView& operator=(const GameView& o) = delete;
+    
 public:
 	GameView(GameBoard&);
 	~GameView();
@@ -78,6 +77,10 @@ class GameView {
 	std::unique_ptr<ViewElement> removeElement(int priority);
 	std::unique_ptr<ViewElement> removeElement(const ViewElement*);
 	std::unique_ptr<ViewElement> removeElement(const ViewElement&);
+    
+    void drawCardCount(std::string font, int fontSize);
+	void drawResourceCount(std::string font, int fontSize);
+    bool showTotals;
 };
 
 /**
@@ -202,8 +205,8 @@ std::unique_ptr<ViewElement> makeViewButtonText(Fn fn, std::pair<ScreenCoordinat
 
 class TradingView : public ViewElement {
 private:
-	Player& initiating;
-	Player& receiving;
+	std::string initiating;
+	std::string receiving;
 
 	ViewButtonText trade;
 	ViewButtonText cancel;
@@ -215,7 +218,7 @@ class TradingView : public ViewElement {
 protected:
 	virtual bool clicked(ScreenCoordinate coord);
 public:
-	TradingView(Player& initiating, Player& receiving, std::function<bool(std::array<int, 5>, ScreenCoordinate)> trade, std::function<bool(ScreenCoordinate)> cancel, std::array<int, 5> offer);
+	TradingView(const std::string& initiating, const std::string& receiving, std::function<bool(std::array<int, 5>, ScreenCoordinate)> trade, std::function<bool(ScreenCoordinate)> cancel, std::array<int, 5> offer);
 	virtual ~TradingView();
 
 	void render();

include/Player.h

@@ -116,7 +116,7 @@ class Player {
 
     void setGenralModifier();			//3:1 port
 
-    bool offerBankTrade(std::array<int, 5> offer, std::array<int, 5> demand);
+    bool makeBankTrade(std::array<int, 5> offer, std::array<int, 5> demand);
 
     bool acceptOffer(Player& p, std::array<int, 5> offer, std::array<int, 5> demand);
 

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));
 
@@ -74,7 +76,8 @@ GameBoard::GameBoard(const vector<std::string>& playerNames) {
 	}
 	std::cout << getRobber().first << "\n";
 	std::cout << getRobber().second << "\n";
-
+	
+	maxVictoryPoints = 10;
 }
 
 /**
@@ -134,6 +137,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() {
@@ -267,7 +272,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;
 }
 
 /**
@@ -328,8 +335,12 @@ ResourceTile& GameBoard::getResourceTile(Coordinate location) const
  */
 void GameBoard::endTurn()
 {
+	std::cout << currentTurn << std::endl;
 	if(getCurrentPlayer().getVictoryPoints() >= getMaxVictoryPoints())
-		std::cout<<"GG Bitches";
+	{
+		//std::cout<<"GG Bitches";
+		winner = currentTurn;
+	}
 
 	currentTurn++;
 	if(currentTurn >= getNoOfPlayers())
@@ -873,6 +884,43 @@ bool GameBoard::buyUpgradeOnSettlement(Coordinate location, Player& owner) {
 	return false;
 }
 
+/**
+ * Whether a settlement/city at a location can be upgraded to a wonder.
+ */
+bool GameBoard::canUpgradeToWonder(Coordinate location, const Player& owner) const {
+	auto it = corners.find(location);
+	if(it == corners.end()) {
+		std::cout << "there's nothing there" << std::endl;
+		return false;
+	}
+	if(!it->second) {
+		std::cout << "null ptr there" << std::endl;
+		return false;
+	}
+	if(!(it->second->getOwner() == owner)) {
+		std::cout << "wrong owner" << std::endl;
+		return false;
+	}
+	if(dynamic_cast<const Settlement*>(it->second.get()) == 0 && dynamic_cast<const City*>(it->second.get()) == 0) {
+		std::cout << "this isn't a settlement or city" << std::endl;
+		return false;
+	}
+	return true;
+}
+
+bool GameBoard::buyUpgradeOnWonder(Coordinate location, Player& owner) {
+	if(canUpgradeToWonder(location, owner) && owner.canBuyCity()) {
+		if(!owner.buyWonder()) {
+			std::cout << "wat" << std::endl;
+			return false;
+		}
+		UpgradeToWonder(location);
+		return true;
+	}
+	std::cout << "failed for some reason" << std::endl;
+	return false;
+}
+
 /**
  * Place a city on the board.
  * @param location Where to place it on the board.
@@ -1056,6 +1104,31 @@ Player& GameBoard::getCurrentPlayer() const
 	return *players[currentTurn];
 }
 
+
+
+/**
+ * @return true if game has a winner, false otherwise
+ */
+bool GameBoard::hasWinner()
+{
+	if(winner == -1)
+		return false;
+	return true;
+}
+
+
+/**
+ * @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 *players[0];
+}
+
+
 /**
  * @return no of players
  */