Merge pull request #64 from Databean/tradeWithBank

malecki1 · malecki1 · commit fe5d202446b1 · 2014-04-27T15:54:19.000-05:00
Trade with bank
diff --git a/include/GameController.h b/include/GameController.h
@@ -75,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
diff --git a/include/GameDice.h b/include/GameDice.h
@@ -11,6 +11,8 @@ class GameDice {
 	int first;
 	int second;
 public:
+	GameDice();
+	
 	int roll();
 	int getFirst() const;
 	int getSecond() const;
diff --git a/include/GameView.h b/include/GameView.h
@@ -205,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;
@@ -218,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();
diff --git a/include/Player.h b/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);
 
diff --git a/src/GameBoard.cpp b/src/GameBoard.cpp
@@ -76,7 +76,8 @@ GameBoard::GameBoard(const vector<std::string>& playerNames) {
 	}
 	std::cout << getRobber().first << "\n";
 	std::cout << getRobber().second << "\n";
-
+	
+	maxVictoryPoints = 10;
 }
 
 /**
@@ -334,6 +335,7 @@ ResourceTile& GameBoard::getResourceTile(Coordinate location) const
  */
 void GameBoard::endTurn()
 {
+	std::cout << currentTurn << std::endl;
 	if(getCurrentPlayer().getVictoryPoints() >= getMaxVictoryPoints())
 	{
 		//std::cout<<"GG Bitches";
diff --git a/src/GameController.cpp b/src/GameController.cpp
@@ -18,8 +18,6 @@
 GameController::GameController(GameBoard& model, GameView& view) : model(model), view(view) {
 	using namespace std::placeholders;
 	
-	view.addElement(makeViewButton(std::bind(&GameController::handleBoardEvent, this, _1), {{0, 0}, {1, 1}}));
-	
 	auto font = getGraphicsConfig()["font.path"];
 	auto fontSize = getGraphicsConfig()["font.size"];
 	
@@ -36,6 +34,7 @@ GameController::GameController(GameBoard& model, GameView& view) : model(model),
 		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;
 	}
+	view.addElement(makeViewButtonText(std::bind(&GameController::handleBankClick, this, _1), {{0, 0.8}, {0.1, 0.9}}, font, fontSize, "Bank"));
 	
 	view.addElement(makeViewButtonText(std::bind(&GameController::handleCancelButtonEvent, this, _1), {{.92, .96}, {1.0, 1.0}}, font, fontSize, "Cancel"));
 	
@@ -45,7 +44,7 @@ GameController::GameController(GameBoard& model, GameView& view) : model(model),
 	view.addElement(makeViewButtonText(std::bind(&GameController::handleYearOfPlentyCardButtonEvent, this, _1), {{0.85, 0.10}, {0.97, 0.15}},  font, fontSize, "Year of Plenty "));
 	view.addElement(makeViewButtonText(std::bind(&GameController::handleMonopolyCardButtonEvent, this, _1), {{0.85, 0.15}, {0.97, 0.20}},  font, fontSize, "Monopoly "));
 	view.addElement(makeViewButtonText(std::bind(&GameController::handleVictoryPointCardButtonEvent, this, _1), {{0.85, 0.20}, {0.97, 0.25}},  font, fontSize, "Victory Point "));
-
+	
 	view.addElement(makeViewButtonText(std::bind(&GameController::handleWoodButtonEvent, this, _1), {{.85, .30}, {.97, .35}}, font, fontSize, "Wood "));
 	view.addElement(makeViewButtonText(std::bind(&GameController::handleSheepButtonEvent, this, _1), {{.85, .35}, {.97, .40}}, font, fontSize, "Sheep "));
 	view.addElement(makeViewButtonText(std::bind(&GameController::handleOreButtonEvent, this, _1), {{.85, .40}, {.97, .45}}, font, fontSize, "Ore "));
@@ -54,7 +53,7 @@ GameController::GameController(GameBoard& model, GameView& view) : model(model),
     
     view.addElement(makeViewButtonText(std::bind(&GameController::viewCardTotals, this, _1), {{.85, .55}, {.97, .60}}, font, fontSize, "Show Totals"));
 
-
+	view.addElement(100, makeViewButton(std::bind(&GameController::handleBoardEvent, this, _1), {{0, 0}, {1, 1}}));
 	stateStack.push_back(BASESTATE);
 }
 
@@ -491,7 +490,7 @@ bool GameController::handlePlayerClick(ScreenCoordinate coord, Player& player) {
 			return true;
 		});
 
-		view.addElement(priority, std::unique_ptr<ViewElement>(new TradingView(initiating, receiving, tradeFunction, cancelFunction, initial)));
+		view.addElement(priority, std::unique_ptr<ViewElement>(new TradingView(initiating.getName(), receiving.getName(), tradeFunction, cancelFunction, initial)));
 		std::cout << player.getName() << std::endl;
 		return true;
 
@@ -519,6 +518,37 @@ bool GameController::handlePlayerClick(ScreenCoordinate coord, Player& player) {
 	return true;
 }
 
+/**
+ * Handle a player beginning a trade with the bank.
+ */
+bool GameController::handleBankClick(ScreenCoordinate screenCoord) {
+	
+	auto priority = -10;
+	
+	auto tradeFunction = [this, priority](std::array<int, 5> offer, ScreenCoordinate coord) {
+		std::array<int, 5> splitOffer;
+		std::array<int, 5> splitDemand;
+		for(int i = 0; i < 5; i++) {
+			splitOffer[i] = offer[i] > 0 ? 0 : -offer[i];
+			splitDemand[i] = offer[i] < 0 ? 0 : offer[i];
+		}
+		if(model.getCurrentPlayer().makeBankTrade(splitOffer, splitDemand)) {
+			view.removeElement(priority);
+		}
+		return true;
+	};
+	
+	auto cancelFunction = [this, priority](ScreenCoordinate coord) {
+		view.removeElement(priority);
+		return true;
+	};
+	std::array<int, 5> initial{{0, 0, 0, 0, 0}};
+	view.addElement(priority, std::unique_ptr<ViewElement>(new TradingView(model.getCurrentPlayer().getName(), "Bank", tradeFunction, cancelFunction, initial)));
+	
+	return true;
+}
+
+
 /**
  * Handle a trade offer from a player.
  * @param coord The coordinate clicked on to initiate the trade.
@@ -549,7 +579,7 @@ bool GameController::handleTradeOffer(ScreenCoordinate coord, Player& initiating
 			return true;
 		});
 		
-		view.addElement(priority, std::unique_ptr<ViewElement>(new TradingView(initiating, receiving, tradeFunction, cancelFunction, counterOffer)));
+		view.addElement(priority, std::unique_ptr<ViewElement>(new TradingView(initiating.getName(), receiving.getName(), tradeFunction, cancelFunction, counterOffer)));
 	}
 	return true;
 }
@@ -627,4 +657,3 @@ bool GameController::handleBrickButtonEvent(ScreenCoordinate coord){
 	return false;
 
 }
-
diff --git a/src/GameDice.cpp b/src/GameDice.cpp
@@ -5,13 +5,18 @@
 
 using std::rand;
 
+GameDice::GameDice() {
+	first = 3;
+	second = 3;
+}
+
 /**
  * Re-roll the dice.
  * @return The sum of the two dice.
  */
 int GameDice::roll() {
-	first = rand() % 6 + 1;
-	second = rand() % 6 + 1;
+	first = (rand() % 6) + 1;
+	second = (rand() % 6) + 1;
 	
 	return first + second;
 }
diff --git a/src/GameView.cpp b/src/GameView.cpp
@@ -207,7 +207,7 @@ bool GameView::acceptInput(SDL_Event& event) {
 		ScreenCoordinate screen = {(float) event.button.x / getGraphicsConfig()["screen.width"], 1.f - (float) event.button.y / getGraphicsConfig()["screen.height"]};
 		for(auto& it : viewElements) {
 			if(it.second->handleClick(screen)) {
-				//break;
+				break;
 			}
 		}
 	}
@@ -606,13 +606,12 @@ void DrawingGameVisitor::visit(GameDice& dice) {
 	glColor3d(1.0, 1.0, 1.0);	
 	static std::map<int, std::pair<float, float>> topLeftOffset;
 	//construct offset map
+	
 	for (int i = 1; i < 7; i++) {
-		
 		//topLeftOffset.emplace(i, make_pair(DiceXCoords[(i-1)%3], DiceYCoords[i/4]));
 		topLeftOffset.insert(make_pair(i, make_pair(DiceXCoords[(i-1)%3], DiceYCoords[i/4])));
 	}
 	
-
 	drawTexturedRectangle(topLeftOffset.find(dice.getFirst())->second, DIE_SCREEN_SIDE_LENGTH, 
 		lDieScreenLoc, DIE_SIDE_LENGTH);
 		
@@ -716,7 +715,7 @@ void DrawingGameVisitor::visit(DevelopmentCard& card) {
  * @param cancel The callback for the "cancel" button
  * @param initialOffer The initial offer to display.
  */
-TradingView::TradingView(Player& initiating, Player& receiving, std::function<bool(std::array<int, 5>, ScreenCoordinate)> trade, std::function<bool(ScreenCoordinate)> cancel, std::array<int, 5> initialOffer) : 
+TradingView::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> initialOffer) : 
 	ViewElement({getGraphicsConfig()["screen.tradingView.bottomLeft"], getGraphicsConfig()["screen.tradingView.topRight"]}),
 	initiating(initiating), 
 	receiving(receiving),
@@ -785,7 +784,7 @@ void TradingView::render() {
 	}
 	auto playersBottomLeft = getGraphicsConfig()["screen.tradingView.players.bottomLeft"];
 	auto playersTopRight = getGraphicsConfig()["screen.tradingView.players.topRight"];
-	renderText(font, fontSize, playersBottomLeft, playersTopRight, initiating.getName() + " -> " + receiving.getName());
+	renderText(font, fontSize, playersBottomLeft, playersTopRight, initiating + " -> " + receiving);
 	
 	cancel.render();
 	trade.render();
diff --git a/src/Player.cpp b/src/Player.cpp
@@ -624,6 +624,37 @@ bool Player::acceptOffer(Player& p, std::array<int, 5> offer, std::array<int, 5>
 	return true;
 }
 
+/**
+ * Make a trade with the bank if the offer is valid.
+ * @param offer The resources the player is offering.
+ * @param demand The resources the player wants from the bank.
+ */
+bool Player::makeBankTrade(std::array<int, 5> offer, std::array<int, 5> demand) {
+	//Make sure i have the resources i'm offering
+	for(int i = 0; i < 5; i++) {
+		if(offer[i] > resources[i]) {
+			std::cout << "don't have enough " << i << "(" << offer[i] << ">" << resources[i] << ")" << std::endl;
+			return false;
+		}
+	}
+	int credits = 0;
+	for(int i = 0; i < 5; i++) {
+		credits += offer[i] / tradeModifiers[i];
+	}
+	for(int i = 0; i < 5; i++) {
+		credits -= demand[i];
+	}
+	if(credits < 0) {
+		std::cout << "bank finds this unacceptable" << std::endl;
+		return false;
+	}
+	
+	for(int i = 0; i < 5; i++) {
+		resources[i] -= offer[i];
+		resources[i] += demand[i];
+	}
+	return true;
+}
 
 /**
  * picks any one resource at random for robber to steal

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,8 @@ GameBoard::GameBoard(const vector<std::string>& playerNames) {`
`76`	`76`	`}`
`77`	`77`	`std::cout << getRobber().first << "\n";`
`78`	`78`	`std::cout << getRobber().second << "\n";`
`79`		`-`
	`79`	`+`
	`80`	`+ maxVictoryPoints = 10;`
`80`	`81`	`}`
`81`	`82`
`82`	`83`	`/**`
`@@ -334,6 +335,7 @@ ResourceTile& GameBoard::getResourceTile(Coordinate location) const`
`334`	`335`	`*/`
`335`	`336`	`void GameBoard::endTurn()`
`336`	`337`	`{`
	`338`	`+ std::cout << currentTurn << std::endl;`
`337`	`339`	`if(getCurrentPlayer().getVictoryPoints() >= getMaxVictoryPoints())`
`338`	`340`	`{`
`339`	`341`	`//std::cout<<"GG Bitches";`