Merge branch 'master' into move_dice_again

Conflicts:
	src/main.cpp

Author: Databean

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

include/CornerPiece.h

@@ -16,7 +16,7 @@ class CornerPiece : public GamePiece {
 	CornerPiece(CornerPiece&) = delete;
 	~CornerPiece();
 	CornerPiece& operator=(CornerPiece&) = delete;
-	
+
 	Player& getOwner();
 	const Player& getOwner() const;
 

include/Deck.h

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

include/DevelopmentCard.h

@@ -20,14 +20,15 @@
 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 {
 
-protected:
+private:
     DevCardType type;
-    GameBoard& board;
 public:
-    DevelopmentCard(GameBoard& board);
+    DevelopmentCard() {}
     virtual ~DevelopmentCard();
 
     virtual DevCardType getType() const = 0;
@@ -36,66 +37,53 @@ class DevelopmentCard {
 	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(GameBoard& board);
-//	virtual ~KnightCard();
-
+	KnightCard() {}
     virtual DevCardType getType() const;
-    void playCard(Player *player, Coordinate target);
-
 };
 
-
-
+/**
+ * A development card that gives a permanent victory point on usage.
+ */
 class VictoryPointCard : public DevelopmentCard {
 public:
-    VictoryPointCard(GameBoard& board);
-//    virtual ~VictoryPointCard();
-
+    VictoryPointCard() {}
     virtual DevCardType getType() const;
-
 };
 
-
+/**
+ * A development card used to retrieve two resources of any type from the bank.
+ */
 class YearOfPlentyCard : public DevelopmentCard {
 public:
-    YearOfPlentyCard(GameBoard& board);
-//    virtual ~YearOfPlentyCard();
-
+    YearOfPlentyCard() {}
     virtual DevCardType getType() const;
-    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(GameBoard& board);
-//    virtual ~MonopolyCard();
-
+    MonopolyCard() {}
     virtual DevCardType getType() const;
-    void playCard(Player *player, int rType);
-
 };
 
-
-
+/**
+ * A development card used to build two roads at no cost.
+ */
 class RoadBuildingCard : public DevelopmentCard {
 private:
 
 public:
-	RoadBuildingCard(GameBoard& board);
-//	virtual ~RoadBuildingCard();
-
+	RoadBuildingCard() {};
     virtual DevCardType getType() const;
-    void playCard(Player* player, Coordinate start1, Coordinate end1, Coordinate start2, Coordinate end2);
 };
 
 

include/GameBoard.h

@@ -48,7 +48,6 @@ class GameBoard {
 	bool isValidBoard() const;
 
 
-	bool verifyRoadPlacement(Coordinate start, Coordinate end, Player& Owner) const;
 	bool outOfBounds(const Coordinate& coord) const;
 	bool roadExists(Coordinate start, Coordinate end) const;
 	bool isRoadConnectionPoint(Coordinate point, Player& Owner) const;
@@ -85,28 +84,31 @@ class GameBoard {
 
 	int getMaxVictoryPoints();
 	void setMaxVictoryPoints(int maxVicPts);
-
 	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;
+	void updateLongestRoadPlayer();
+	void updateLargestArmyPlayer();
 
 	std::vector<Settlement*> GetNeighboringSettlements(Coordinate location) const;
 	std::vector<CornerPiece*> GetNeighboringCorners(Coordinate location) const;
 
-
+	int CountCornerPoints(Player& owner);
 
 	void PlaceSettlement(Coordinate location, Player& Owner);
 	void UpgradeSettlement(Coordinate location);
 	void UpgradeToWonder(Coordinate location);
 
 
+	bool verifyRoadPlacement(Coordinate start, Coordinate end, Player& Owner) const;
 	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);
+	bool canPlayBuildRoadCard(Coordinate start1, Coordinate end1, Coordinate start2, Coordinate end2, Player& Owner);
 
 	void accept(GameVisitor& visitor);
 
@@ -121,6 +123,7 @@ class GameBoard {
 
     void moveRobber(Coordinate newRobber);
     Coordinate getRobber() const;
+    bool canRobberRob(Player& opponent, Coordinate location);
 
 };
 

include/GameController.h

@@ -2,6 +2,7 @@
 #define GAME_CONTROLLER_H
 
 #include "Util.h"
+#include <vector>
 
 #include <array>
 
@@ -10,18 +11,22 @@ class ClickCoordinateEvent;
 class GameView;
 class Player;
 
+
+enum ControlState {BASESTATE, MODALSTATE, BUILDROAD, BUILDSETTLEMENT, ROBBER,
+	VICTORYPOINT_DEVCARD, BUILDROAD_DEVCARD, KNIGHT_DEVCARD, YEAROFPLENTY_DEVCARD, MONOPOLY_DEVCARD};
+
+
 /**
- * Takes interpreted Catan events from the View and calls the appropriate functions on the model to changee the state
+ * Takes interpreted Catan events from the View and calls the appropriate functions on the model to change the state
  * in response.
  */
 class GameController {
 private:
 	GameBoard& model;
 	GameView& view;
 
-	bool placingRoads;
-	bool placingCities;
-	Coordinate lastCoordClick;
+	std::vector<ControlState> stateStack;
+	std::vector<Coordinate> clickHistory;
 
 	GameController(const GameController& o) : model(o.model), view(o.view) {} //deleted
 	GameController& operator=(const GameController& o) { return *this; } //deleted
@@ -33,6 +38,26 @@ class GameController {
 	bool handleBoardEvent(ScreenCoordinate);
 	bool handleRoadButtonEvent(ScreenCoordinate);
 	bool handleSettlementButtonEvent(ScreenCoordinate);
+	bool handleRoadCardButtonEvent(ScreenCoordinate);
+	bool handleKnightCardButtonEvent(ScreenCoordinate);
+	bool handleYearOfPlentyCardButtonEvent(ScreenCoordinate);
+	bool handleMonopolyCardButtonEvent(ScreenCoordinate);
+	bool handleVictoryPointCardButtonEvent(ScreenCoordinate);
+	bool handleCancelButtonEvent(ScreenCoordinate);
+
+	bool handleConfirmRoadCard(ScreenCoordinate);
+	bool handleCancelDialogueEvent(ScreenCoordinate);
+
+	void pushState(ControlState);
+	ControlState getState();
+	ControlState popState();
+	void storeClick(Coordinate clickCoordinate);
+	Coordinate getLastClick();
+	Coordinate getPastClick(int howLongAgo);
+	void clearClickHistory();
+	bool hasClickHistory();
+	int getClickHistorySize();
+
 	bool handlePlayerClick(ScreenCoordinate, Player&);
 	bool handleTradeOffer(ScreenCoordinate, Player& initiating, std::array<int, 5>, Player& receiving, std::array<int, 5>);
 };

include/GameDice.h

@@ -2,9 +2,6 @@
 #define GAMEDICE_H
 
 
-
-
-
 class GameVisitor;
 
 class GameDice {
@@ -25,4 +22,4 @@ class GameDice {
 
 };
 
-#endif	
+#endif