merging master into board randomization

Author: Databean

.gitignore

@@ -17,3 +17,5 @@ warsofcatan
 
 *.d
 *.test
+/Default
+*.wocs

Makefile

@@ -3,11 +3,11 @@ export SRC_HOME := $(realpath src)
 export INCL_HOME := $(realpath include)
 export TEST_LINK_FILES := $(realpath UnitTest++/libUnitTest++.a)
 export TEST_INCLUDE := $(realpath UnitTest++/src)
-EXECUTABLE := warsofcatan
+export EXECUTABLE := warsofcatan
 ALLFILES := $(wildcard $(SRC_HOME)/*) $(wildcard $(INCL_HOME)/*)
 export CXX := g++
 export LD := g++
-export CXXFLAGS := -g -I$(INCL_HOME) -std=c++0x
+export CXXFLAGS := -g -I$(INCL_HOME) -std=c++0x -Wall
 export LDFLAGS := -lSDL2 -lGL -lGLU
 
 .PHONY: all

include/City.h

@@ -0,0 +1,14 @@
+#ifndef CITY_H
+#define CITY_H
+
+class City public CornerPiece {
+private:
+
+public:
+	City();
+	City(City&) = delete;
+	~City();
+	City& operator=(City&) = delete;
+};
+
+#endif

include/CornerPiece.h

@@ -0,0 +1,14 @@
+#ifndef CORNERPIECE_H
+#define CORNERPIECE_H
+
+class CornerPiece {
+private:
+
+public:
+	CornerPiece();
+	CornerPiece(CornerPiece&) = delete;
+	~CornerPiece();
+	CornerPiece& operator=(CornerPiece&) = delete;
+};
+
+#endif

include/Deck.h

@@ -0,0 +1,28 @@
+/*
+ * Deck.h
+ *
+ *  Created on: Feb 23, 2014
+ *      Author: ankitbhutani
+ */
+
+#ifndef DECK_H_
+#define DECK_H_
+
+#include <vector>
+#include <algorithm>
+#include "DevelopmentCard.h"
+
+class Deck {
+
+private:
+	std::vector<DevelopmentCard*> deck;
+
+public:
+	Deck();
+	virtual ~Deck();
+
+	int getSize();
+	DevelopmentCard* drawCard();
+};
+
+#endif /* DECK_H_ */

include/DevelopmentCard.h

@@ -0,0 +1,101 @@
+//
+//  DevelopmentCard.h
+//  Catan parts
+//
+//  Created by Ankit Bhutani on 2/22/14.
+//  Copyright (c) 2014 Ankit Bhutani. All rights reserved.
+//
+
+#ifndef Catan_parts_DevelopmentCard_h
+#define Catan_parts_DevelopmentCard_h
+
+
+#include "Util.h"
+#include "Player.h"
+
+
+enum DevCardType { KNIGHT, VICTORYPOINT, YEAROFPLENTY, MONOPOLY, ROADBUILDING };
+
+
+
+class DevelopmentCard {
+
+private:
+    Player* owner;
+    DevCardType type;
+public:
+    DevelopmentCard(Player* player);
+//    virtual ~DevelopmentCard();
+
+    virtual DevCardType getType() = 0;
+    virtual void playCard() = 0;
+
+};
+
+
+
+class KnightCard : public DevelopmentCard {
+private:
+
+public:
+	KnightCard(Player* player);
+//	virtual ~KnightCard();
+
+    DevCardType getType();
+    void playCard();
+
+};
+
+
+
+class VictoryPointCard : public DevelopmentCard {
+public:
+    VictoryPointCard(Player* player);
+//    virtual ~VictoryPointCard();
+
+    DevCardType getType();
+    void playCard();
+
+};
+
+
+class YearOfPlentyCard : public DevelopmentCard {
+public:
+    YearOfPlentyCard(Player* player);
+//    virtual ~YearOfPlentyCard();
+
+    DevCardType getType();
+    void playCard();
+
+};
+
+
+
+
+class MonopolyCard : public DevelopmentCard {
+public:
+    MonopolyCard(Player* player);
+//    virtual ~MonopolyCard();
+
+    DevCardType getType();
+    void playCard();
+
+};
+
+
+
+class RoadBuildingCard : public DevelopmentCard {
+private:
+
+public:
+	RoadBuildingCard(Player* player);
+//	virtual ~RoadBuildingCard();
+
+    DevCardType getType();
+    void playCard();
+};
+
+
+
+
+#endif

include/GameBoard.h

@@ -5,35 +5,37 @@
 #include <vector>
 #include <memory>
 #include <utility>
-#include <algorithm>
+#include <string>
+#include <iostream>
+#include <fstream>
+#include <cstddef>
 
 #include "Util.h"
 #include "GamePiece.h"
 
-
-
-enum resourceType { WHEAT, SHEEP, STONE, BRICK, WOOD, DESERT };
-
 class GameBoard {
 private:
 	std::map<Coordinate, std::unique_ptr<GamePiece>> corners;
 	std::map<Coordinate, std::unique_ptr<GamePiece>> resources;
 	std::vector<std::unique_ptr<const Road>> roads;
-    
+	
+	int constructBoardFromFile(std::ifstream &file);
+	int constructFileFromBoard(std::ofstream &file);
 public:
 	GameBoard();
 	GameBoard(GameBoard&) = delete;
 	~GameBoard();
 	GameBoard& operator=(GameBoard&) = delete;
+	
+	int save_Board(std::string filename);
+	int load_Board(std::string filename);
+	const std::map<Coordinate, std::unique_ptr<GamePiece>>& getResources() const;
+	
 	std::vector<Settlement*> GetNeighboringSettlements(Coordinate location);
 
 	void PlaceSettlement(Coordinate location, Player& Owner);
 
 	void init_resources();
 };
 
-
-
-
-
-#endif
+#endif

include/GamePiece.h

@@ -4,6 +4,8 @@
 #include "Util.h"
 #include "Player.h"
 
+enum resourceType { WHEAT, SHEEP, STONE, BRICK, WOOD, DESERT };
+
 class GameBoard;
 
 class GamePiece {
@@ -13,26 +15,29 @@ class GamePiece {
 	GamePiece(GameBoard& board, Coordinate location);
 	GamePiece(GamePiece&) = delete;
 	virtual ~GamePiece();
-	Coordinate location; 
 	//virtual GamePiece& operator=(GamePiece&) = delete;
+	
+	Coordinate getCoordinates() const;
+	GameBoard& getBoard();
+	const GameBoard& getBoard() const;
+	
+	Coordinate location; 
 };
 
 class ResourceTile : public GamePiece {
-private:
-	
 public:
 	ResourceTile(GameBoard& board);
-	ResourceTile(GameBoard& board, Coordinate location, int resource, int value);
+	ResourceTile(GameBoard& board, Coordinate location, resourceType resource, int value);
 	ResourceTile(ResourceTile&) = delete;
+	//virtual ResourceTile& operator=(ResourceTile&) = delete;
 
 	//dispense resource cards to owning players
 	void Payout();
 
-	int resource;
+	resourceType resource;
 	int value;
 
 	virtual ~ResourceTile();
-	//virtual ResourceTile& operator=(ResourceTile&) = delete;
 };
 
 class Settlement : public GamePiece {
@@ -42,8 +47,9 @@ class Settlement : public GamePiece {
 	Settlement(GameBoard& board, Coordinate location, Player& owner);
 	Settlement(Settlement&) = delete;
 	virtual ~Settlement();
-	bool city;
 	//virtual Settlement& operator=(Settlement&) = delete;
+	
+	bool city;
 };
 
 class Road {
@@ -59,4 +65,5 @@ class Road {
 	//Road& operator=(Road&) = delete;
 };
 
-#endif
+#endif
+

include/Player.h

@@ -1,14 +1,66 @@
+//
+//  Player.h
+//  Catan parts
+//
+//  Created by Ankit Bhutani on 2/22/14.
+//  Copyright (c) 2014 Ankit Bhutani. All rights reserved.
+//
+
 #ifndef PLAYER_H
 #define PLAYER_H
 
+
+#include <vector>
+#include <string>
+
+//#include "DevelopmentCard.h"
+
+
+class DevelopmentCard;
+class Deck;
+
+//#include <ext/hash_map>
+//#include <unordered_map>
+
 class Player {
 private:
-	
+    std::string name;
+
+    std::vector<DevelopmentCard*> developmentCards;
+
+    int armySize;
+    int longestRoad;
+    int victoryPoints;
+
+    int resources[5];
+
+
 public:
-	Player();
-	Player(Player&) = delete;
+
+	Player(std::string playerName);
 	~Player();
-	Player& operator=(Player&) = delete;
+
+    int getVictoryPoints();
+    void updateVictoryPoints();
+
+    int getDevCardsInHand();
+
+    void buyCard(DevelopmentCard* card);
+    void playCard(DevelopmentCard* card);
+
+    int getWood();
+    int getBrick();
+    int getOre();
+    int getWheat();
+    int getWool();
+
+    void setWood(int resource);
+    void setBrick(int resource);
+    void setOre(int resource);
+    void setWheat(int resource);
+    void setWool(int resource);
+
+
 };
 
-#endif
+#endif

include/Renderer.h

@@ -4,6 +4,6 @@
 #include "GameBoard.h"
 #include "Player.h"
 
-void renderBoard(GameBoard& board, Player& perspective);
+void renderBoard(const GameBoard& board, const Player& perspective);
 
 #endif