Made an initial board set up and gave Players colors

Author: PickledMonkey

include/GameBoard.h

@@ -73,6 +73,8 @@ class GameBoard {
 	~GameBoard();
 	GameBoard& operator=(GameBoard&) = delete;
 
+	void initializeGame();
+
 	void save(std::ostream& out);
 
 	ResourceTile& getResourceTile(Coordinate location) const;

include/Player.h

@@ -48,6 +48,8 @@ class Player {
     int resources[5];
     int tradeModifiers[5];
 
+    float color[3];
+
 
     void tradeWithBank(std::array<int, 5> offer, std::array<int, 5> demand);
 
@@ -69,6 +71,7 @@ class Player {
     void setLongestRoad(bool);
     void setLongestRoadSize(int);
 
+    float* getColor();
 
     int getVictoryPointsWithoutCards();
     int getVictoryPointCards();
@@ -127,7 +130,7 @@ class Player {
     int getWheat() const;
     int getWool() const;
 
-    void giveDevCardBoon();
+    void setStartingValues();
 
     int getDevelopmentCards(int card_type) const;
     int getVictoryCards() const;

src/GameBoard.cpp

@@ -326,6 +326,30 @@ void GameBoard::endTurn()
 	startTurn();
 }
 
+void GameBoard::initializeGame(){
+	PlaceSettlement(Coordinate(-1,2), getPlayer(0));
+	PlaceSettlement(Coordinate(1,1), getPlayer(0));
+	getPlayer(0).setStartingValues();
+
+	PlaceSettlement(Coordinate(-2,4), getPlayer(1));
+	PlaceSettlement(Coordinate(-2,6), getPlayer(1));
+	getPlayer(1).setStartingValues();
+
+	PlaceSettlement(Coordinate(-1,7), getPlayer(2));
+	PlaceSettlement(Coordinate(1,6), getPlayer(2));
+	getPlayer(2).setStartingValues();
+
+	PlaceSettlement(Coordinate(2,4), getPlayer(3));
+	PlaceSettlement(Coordinate(2,2), getPlayer(3));
+	getPlayer(3).setStartingValues();
+
+	for(int i = 1; i < 13; i++){
+		payoutResources(i);
+	}
+
+}
+
+
 /**
  * @return The no of Victory points needed to win the game
  */

src/GameController.cpp

@@ -29,9 +29,9 @@ GameController::GameController(GameBoard& model, GameView& view) : model(model),
 
 	auto playerTopY = 0.9;
 	for(auto i = 0; i < model.getNoOfPlayers(); i++) {
-		auto width = 0.2;
+		auto width = 0.15;
 		Player& player = model.getPlayer(i);
-		view.addElement(makeViewButtonText(std::bind(&GameController::handlePlayerClick, this, _1, std::ref(player)), {{1.0 - width, playerTopY - 0.1}, {1.0, playerTopY}}, font, fontSize, player.getName()));
+		view.addElement(makeViewButtonText(std::bind(&GameController::handlePlayerClick, this, _1, std::ref(player)), {{1.0 - width, playerTopY - 0.05}, {1.0, playerTopY}}, font, fontSize, player.getName()));
 		playerTopY -= 0.05;
 	}
 

src/GameView.cpp

@@ -415,7 +415,9 @@ void DrawingGameVisitor::visit(Road& road) {
 	auto cosPerp = std::cos(roadPerpAngle);
 	auto sinPerp = std::sin(roadPerpAngle);
 
-	glColor3d(0., 0., 0.);
+	float* color = road.getOwner().getColor();
+	glColor3d(color[0], color[1], color[2]);
+
 	glBindTexture(GL_TEXTURE_2D, 0);
 	glBegin(GL_QUADS);
 	glVertex2d(startScreenPos.first - cosPerp * roadWidth, startScreenPos.second - sinPerp * roadWidth);
@@ -435,7 +437,9 @@ void DrawingGameVisitor::visit(Settlement& settlement) {
 	auto centerScreenPos = coordToScreen(settlement.getLocation());
 
 	glBindTexture(GL_TEXTURE_2D, 0);
-	glColor3d(0., 0., 0.);
+	float* color = settlement.getOwner().getColor();
+	glColor3d(color[0], color[1], color[2]);
+
 	glBegin(GL_QUADS);
 	glVertex2d(centerScreenPos.first, centerScreenPos.second + settlementRadius);
 	glVertex2d(centerScreenPos.first + settlementRadius, centerScreenPos.second);
@@ -454,7 +458,10 @@ void DrawingGameVisitor::visit(City& city) {
 	auto centerScreenPos = coordToScreen(city.getLocation());
 
 	glBindTexture(GL_TEXTURE_2D, 0);
-	glColor3d(0., 0., 0.);
+
+	float* color = city.getOwner().getColor();
+	glColor3d(color[0], color[1], color[2]);
+
 	glBegin(GL_QUADS);
 	glVertex2d(centerScreenPos.first + cityRadius, centerScreenPos.second + cityRadius);
 	glVertex2d(centerScreenPos.first + cityRadius, centerScreenPos.second - cityRadius);
@@ -473,7 +480,10 @@ void DrawingGameVisitor::visit(Wonder& wonder) {
 	auto centerScreenPos = coordToScreen(wonder.getLocation());
 
 	glBindTexture(GL_TEXTURE_2D, 0);
-	glColor3d(0., 0., 0.);
+
+	float* color = wonder.getOwner().getColor();
+	glColor3d(color[0], color[1], color[2]);
+
 	glBegin(GL_QUADS);
 	glVertex2d(centerScreenPos.first + wonderRadius, centerScreenPos.second + wonderRadius);
 	glVertex2d(centerScreenPos.first + wonderRadius, centerScreenPos.second - wonderRadius);

src/Player.cpp

@@ -49,6 +49,12 @@ Player::Player(GameBoard& board, std::string playerName) : name(playerName), boa
 		c = 0;
 	}
 
+	color[0] = .01 * (float)(std::rand()%101);
+	color[1] = .01 * (float)(std::rand()%101);
+	color[2] = .01 * (float)(std::rand()%101);
+
+	color[std::rand()%3] = 0;
+
 }
 
 /**
@@ -84,6 +90,12 @@ Player::Player(GameBoard& board, XMLElement* elem) : board(board)
 	longestRoad = 0;
 	victoryPoints = 0;
 	baseVictoryPoints = 0;
+
+	color[0] = .01 * (float)(std::rand()%101);
+	color[1] = .01 * (float)(std::rand()%101);
+	color[2] = .01 * (float)(std::rand()%101);
+
+	color[std::rand()%3] = 0;
 }
 
 /**
@@ -93,6 +105,11 @@ Player::~Player() {
 
 }
 
+float* Player::getColor(){
+	return color;
+}
+
+
 /**
  * The number of development cards the player is holding.
  * @return The number of cards.
@@ -507,10 +524,8 @@ bool Player::playRoadBuilding(Coordinate start1, Coordinate end1, Coordinate sta
 /**
  * A cheat class that gives the player 5 of every development card, meant for debugging
  */
-void Player::giveDevCardBoon(){
-	for(int i = 0; i < 5; i++){
-		developmentCards[i]+=5;
-	}
+void Player::setStartingValues(){
+	developmentCards[ROADBUILDING] = 1;
 }
 
 

src/main.cpp

@@ -76,19 +76,21 @@ int main(int argc, char *argv[]) {
 
 	updateViewport(windowWidth, windowHeight);
 
-	GameBoard model({"testPlayer", "testPlayer2", "testPlayer3", "testPlayer4"});
+	GameBoard model({"Player1", "Player2", "Player3", "Player4"});
 	GameView view(model);
 	GameController controller(model, view);
 
-	Player& firstPlayer = model.getPlayer(0);
-	
-	model.PlaceSettlement(Coordinate{0, 0}, firstPlayer);
-	model.PlaceRoad(Coordinate{0, 0}, Coordinate{1, 0}, firstPlayer);
-	model.PlaceRoad(Coordinate{1, 0}, Coordinate{1, 1}, firstPlayer);
-	model.PlaceRoad(Coordinate{1, 1}, Coordinate{0, 2}, firstPlayer);
-	model.PlaceSettlement(Coordinate{0, 2}, firstPlayer);
-	model.UpgradeSettlement(Coordinate{0, 2});
+	model.initializeGame();
 
+//	Player& firstPlayer = model.getPlayer(0);
+//
+//	model.PlaceSettlement(Coordinate{0, 0}, firstPlayer);
+//	model.PlaceRoad(Coordinate{0, 0}, Coordinate{1, 0}, firstPlayer);
+//	model.PlaceRoad(Coordinate{1, 0}, Coordinate{1, 1}, firstPlayer);
+//	model.PlaceRoad(Coordinate{1, 1}, Coordinate{0, 2}, firstPlayer);
+//	model.PlaceSettlement(Coordinate{0, 2}, firstPlayer);
+//	model.UpgradeSettlement(Coordinate{0, 2});
+//
 	bool running = true;
 	while(running) {
 		SDL_Event event;