Committer: Alex>

 On branch board_data_struct
	modified:   ../Makefile
	modified:   ../include/GameBoard.h
	modified:   ../include/GamePiece.h
	modified:   GameBoard.cpp
	modified:   GamePiece.cpp
	new file:   board_layout.txt

Author: parallels

Makefile

@@ -7,7 +7,7 @@ EXECUTABLE := warsofcatan
 ALLFILES := $(wildcard $(SRC_HOME)/*) $(wildcard $(INCL_HOME)/*)
 export CXX := g++
 export LD := g++
-export CXXFLAGS := -g -I$(INCL_HOME) -std=gnu++11
+export CXXFLAGS := -g -I$(INCL_HOME) -std=c++0x
 export LDFLAGS := -lSDL2 -lGL -lGLU
 
 .PHONY: all

include/GameBoard.h

@@ -9,15 +9,29 @@
 #include "Util.h"
 #include "GamePiece.h"
 
+
+
+enum resourceType { WHEAT, SHEEP, STONE, BRICK, WOOD, DESERT };
+
 class GameBoard {
 private:
-	std::map<Coordinate, std::unique_ptr<GamePiece>> pieces;
+	std::map<Coordinate, std::unique_ptr<GamePiece>> corners;
+	std::map<Coordinate, std::unique_ptr<GamePiece>> resources;
 	std::vector<std::unique_ptr<const Road>> roads;
 public:
 	GameBoard();
 	GameBoard(GameBoard&) = delete;
 	~GameBoard();
 	GameBoard& operator=(GameBoard&) = delete;
+	std::vector<GamePiece> GetNeighbors(Coordinate location);
+
+	void PlaceSettlement(Coordinate location, Player& Owner);
+
+	void init_resources();
 };
 
+
+
+
+
 #endif

include/GamePiece.h

@@ -10,30 +10,40 @@ class GamePiece {
 private:
 	GameBoard& board;
 public:
-	GamePiece(GameBoard& board);
+	GamePiece(GameBoard& board, Coordinate location);
 	GamePiece(GamePiece&) = delete;
 	virtual ~GamePiece();
-	virtual GamePiece& operator=(GamePiece&) = delete;
+	Coordinate location; 
+	//virtual GamePiece& operator=(GamePiece&) = delete;
 };
 
 class ResourceTile : public GamePiece {
 private:
 
 public:
 	ResourceTile(GameBoard& board);
+	ResourceTile(GameBoard& board, Coordinate location, int resource, int value);
 	ResourceTile(ResourceTile&) = delete;
+
+	//dispense resource cards to owning players
+	void Payout();
+
+	int resource;
+	int value;
+
 	virtual ~ResourceTile();
-	virtual ResourceTile& operator=(ResourceTile&) = delete;
+	//virtual ResourceTile& operator=(ResourceTile&) = delete;
 };
 
 class Settlement : public GamePiece {
 private:
 	Player& owner;
 public:
-	Settlement(GameBoard& board, Player& owner);
+	Settlement(GameBoard& board, Coordinate location, Player& owner);
 	Settlement(Settlement&) = delete;
 	virtual ~Settlement();
-	virtual Settlement& operator=(Settlement&) = delete;
+	bool city;
+	//virtual Settlement& operator=(Settlement&) = delete;
 };
 
 class Road {
@@ -46,7 +56,7 @@ class Road {
 	Road(GameBoard& board, Player& owner, Coordinate start, Coordinate end);
 	Road(Road&);
 	~Road();
-	Road& operator=(Road&) = delete;
+	//Road& operator=(Road&) = delete;
 };
 
 #endif

src/GameBoard.cpp

@@ -1,9 +1,75 @@
 #include "GameBoard.h"
 
+#define ADD_RESOURCE(x, y, res, val) (resources[Coordinate(x,y)] = \
+std::unique_ptr<GamePiece>(new ResourceTile(*this, Coordinate(x,y), res, val)))
+#define DUMMY_BOARD //define to instantiate dummy board for debugging 
+
 GameBoard::GameBoard() {
-	
+
+	init_resources();
+
+
 }
 
 GameBoard::~GameBoard() {
 
+}
+/*
+std::vector<GamePiece> GameBoard::GetNeighbors(Coordinate location){
+	std::vector<GamePiece> v;
+	for (int i = -1; i < 1; i++)
+	{
+		Settlement* sett = dynamic_cast<Settlement*>(&(corners[Coordinate(location.first + i, location.second)]));
+		if (sett != 0)
+		{
+			v.insert(sett)
+		}
+		Settlement sett = dynamic_cast<Settlement*>(corners[Coordinate(location.first + i, location.second - i)]);
+		if (sett != 0)
+		{
+			v.insert(sett)		}
+		Settlement sett = dynamic_cast<Settlement*>(corners[Coordinate(location.first, location.second - i)]);
+		if (sett != 0)
+		{
+			v.insert(sett)
+		}
+	}
+}
+
+&/
+
+/* initialize board with a set of resources. Right now, just creates a static tile arrangement to test
+URL: http://images.fanpop.com/images/image_uploads/Differents-Boards-settlers-of-catan-521934_1157_768.jpg*/
+
+void GameBoard::init_resources()
+{
+	
+
+	#ifdef DUMMY_BOARD
+	ADD_RESOURCE(0, 1, BRICK, 2);
+	ADD_RESOURCE(-2, 2, SHEEP, 5);
+	ADD_RESOURCE(2, 0, WOOD, 6);
+	ADD_RESOURCE(-3, 3, DESERT, 0);
+	ADD_RESOURCE(-1, 3, SHEEP, 10);
+	ADD_RESOURCE(1, 2, WHEAT, 9);
+	ADD_RESOURCE(3, 1, WHEAT, 3);
+	ADD_RESOURCE(-4, 6, WOOD, 8);
+	ADD_RESOURCE(-2, 5, SHEEP, 3);
+	ADD_RESOURCE(0, 4, STONE, 11);
+	ADD_RESOURCE(2, 3, STONE, 4);
+	ADD_RESOURCE(4, 2, SHEEP, 8);
+	ADD_RESOURCE(-3, 7, BRICK, 4);
+	ADD_RESOURCE(-1, 6, WHEAT, 6);
+	ADD_RESOURCE(1, 5, WOOD, 5);
+	ADD_RESOURCE(3, 4, BRICK, 10);
+	ADD_RESOURCE(-2, 8, WOOD, 11);
+	ADD_RESOURCE(0, 7, STONE, 12);
+	ADD_RESOURCE(2, 6, WHEAT, 9);
+	#endif
+	
+
+}
+
+void GameBoard::PlaceSettlement(Coordinate location, Player& Owner){
+	corners[location] = std::unique_ptr<GamePiece>(new Settlement(*this, location, Owner));
 }

src/GamePiece.cpp

@@ -2,23 +2,39 @@
 
 #include "GameBoard.h"
 
-GamePiece::GamePiece(GameBoard& board) : board(board) {
+
+
+GamePiece::GamePiece(GameBoard& board, Coordinate location) : board(board), location(location) {
 
 }
 
 GamePiece::~GamePiece() {
 
 }
 
-ResourceTile::ResourceTile(GameBoard& board) : GamePiece(board) {
+ResourceTile::ResourceTile(GameBoard& board, Coordinate location, int resource, int value) : 
+GamePiece(board, location), resource(resource), value(value) {
 
 }
 
 ResourceTile::~ResourceTile() {
-	
+	int a;
 }
 
-Settlement::Settlement(GameBoard& board, Player& owner) : GamePiece(board), owner(owner) {
+
+//pay resource cards to owners of this tile
+
+/*
+void ResourceTile::Payout() {
+	std::vector<GamePiece> neighbors;
+	for (int i = 0; i < neighbors.size; i++) //someone tell me how to traverse a vector less stupidly
+	{
+		neighbors[i].owner.addresource(resource, 1 + neighbors[i].city)
+	}
+}
+*/
+Settlement::Settlement(GameBoard& board, Coordinate location, Player& owner) : 
+GamePiece(board, location), owner(owner), city(0) {
 
 }
 

src/board_layout.txt

@@ -0,0 +1,32 @@
+
+						/ \
+						| |
+						\ /
+						hex cell
+
+
+
+						   (0,8)
+						/ \ /.\ / \
+						| | | | | |
+						\ / \ / \ /
+					  / \ / \ / \ / \
+					  | | | | | | | |
+					  \ / \ / \ / \ /
+					/ \ / \ / \ / \ / \
+			(-4, 6)	|.| | | | | | | |.| (4,2)
+					\ / \ / \ / \ / \ /
+					  / \ / \ / \ / \
+					  | | | | | | | |
+					  \ / \ / \ / \ /
+					    / \ / \ / \
+						| | | | | |
+						\ / \./ \ /
+							(0,0)
+
+							^	 7
+							|y  /
+							|  /
+							| /
+							|/x
+							coordinate axes