No OneTemporary
Actions

Authored By

Unknown

Size

37 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/assets/audio/card.ogg b/assets/audio/card.ogg
	new file mode 100644
	index 0000000..23afc2b
	Binary files /dev/null and b/assets/audio/card.ogg differ
	diff --git a/cardsdeck.cpp b/cardsdeck.cpp
	index 07cdbf0..7d823af 100644
	--- a/cardsdeck.cpp
	+++ b/cardsdeck.cpp
	@@ -1,89 +1,78 @@
	#include "cardsdeck.h"

	CardsDeck::CardsDeck(TextureHolder textures, sf::Font gameFont)
	{



	std::array<std::array<int,2>,4> cardsPos = {
	{
	{1087,95}, {1225, 95}, {1225, 277}, {1087, 277}
	}
	};

	this->textures = textures;
	for (int i=0;i<=3;i++)
	{
	spriteCardBases[i].setTexture(this->textures->textureCardBases[i]);
	spriteCardBases[i].setPosition(cardsPos[i][0],cardsPos[i][1]);

	textPileTitle[i].setFont(*gameFont);
	textPileTitle[i].setCharacterSize(10);
	textPileTitle[i].setPosition(cardsPos[i][0]+10,cardsPos[i][1]+100);

	for (int j=0;j<efc::PILE_SIZE;j++)
	{
	cardsList[i].cardsPile[j].cardType = efc::cardsTypes[j];
	}
	setTitles();
	}
	}

	void CardsDeck::draw(sf::RenderTarget& target, sf::RenderStates states) const
	{
	states.transform *= getTransform();
	for (int i=0;i<=3;i++)
	{
	target.draw(spriteCardBases[i], states);
	target.draw(textPileTitle[i], states);
	-
	}
	}

	void CardsDeck::setTitles()
	{
	for (int i=0;i<=3;i++)
	{
	-// int currentCard = cardsList[i].currentCard;
	-// std::string currentText = cardsList[i].cardsPile[currentCard].cardType;
	-// std::cout << i << " " << currentCard << " " << currentText << std::endl;
	- std::string newTitle = getTitle(i);
	- std::cout << "NEW TITLE " << newTitle << std::endl;
	-
	- textPileTitle[i].setString(newTitle);
	-
	-
	-
	+ textPileTitle[i].setString(getTitle(i));
	}
	}

	void CardsDeck::setFonts(sf::Font *gameFont)
	{
	for (int i=0;i<=3;i++)
	{
	textPileTitle[i].setFont(*gameFont);
	}
	}

	void CardsDeck::nextCard(int pileNumber)
	{
	int currentCard = getCurrentCard(pileNumber);
	currentCard += 1;
	if (currentCard>efc::PILE_SIZE-1)
	currentCard = 0;
	cardsList[pileNumber].currentCard = currentCard;
	setTitles();
	}

	int CardsDeck::getCurrentCard(int pileNumber)
	{
	int currentCard = cardsList[pileNumber].currentCard;
	return currentCard;
	}

	std::string CardsDeck::getTitle(int pileNumber)
	{
	std::string currentText = cardsList[pileNumber].cardsPile[getCurrentCard(pileNumber)].cardType;
	- std::cout << "TITLE " << currentText << std::endl;
	return currentText;
	}
	diff --git a/command.cpp b/command.cpp
	index 7f97b2c..e0f3dba 100644
	--- a/command.cpp
	+++ b/command.cpp
	@@ -1,136 +1,113 @@
	#include "game.h"
	#include "command.h"

	-//Command::Command()
	-//{
	-
	-//}
	-
	Command::Command(efc::Game &currentGame) :
	game(currentGame)
	{
	-// this->game = currentGame;
	-}

	+}

	void Command::removeCard(int playerNumber)
	{
	/*! This should works as following:
	* - iterate over BoardDiamondSeq
	* - find diamonds belonging to the playerNumber
	* - create an array from the aboves
	* - get a random element
	* - remove from the board - set not active
	*/

	- std::cout << "removing diamond number " << playerNumber << std::endl;
	-
	std::vector<int> diamonds;
	for (auto&& i: game.boardDiamonds.diamonds)
	{
	int fieldNumber = i.playerNumber;
	if ((fieldNumber==playerNumber) && (i.boardPosition>-1)
	&& (i.idNumber<4))
	{
	- std::cout << "pushing found " << fieldNumber << std::endl;
	-
	diamonds.push_back(i.boardPosition);
	}
	}
	int numberDiamonds = diamonds.size();
	- std::cout << "found elements " << numberDiamonds << std::endl;
	if (numberDiamonds>=0)
	{
	-// std::cout << "pushing found " << fieldNumber << std::endl;
	int elemToRemove = rand() % numberDiamonds;
	- std::cout << "random found " << elemToRemove << " " << diamonds[elemToRemove] << std::endl;
	-
	game.boardDiamonds.collectField(diamonds[elemToRemove]);
	}


	}
	void Command::removeDiamond(int playerNumber)
	{
	/*! This should works as following:
	* - iterate over BoardDiamondSeq
	* - find diamonds belonging to the playerNumber
	* - create an array from the aboves
	* - get a random element
	* - remove from the board - set not active
	*/

	- std::cout << "removing diamond number " << playerNumber << std::endl;
	-
	std::vector<int> diamonds;
	for (auto&& i: game.boardDiamonds.diamonds)
	{
	int fieldNumber = i.playerNumber;
	if ((fieldNumber==playerNumber) && (i.boardPosition>-1)
	&& (i.idNumber==4))
	{
	- std::cout << "pushing found " << fieldNumber << std::endl;
	-
	diamonds.push_back(i.boardPosition);
	}
	}
	int numberDiamonds = diamonds.size();
	- std::cout << "found elements " << numberDiamonds << std::endl;
	if (numberDiamonds>=0)
	{
	-// std::cout << "pushing found " << fieldNumber << std::endl;
	int elemToRemove = rand() % numberDiamonds;
	- std::cout << "random found " << elemToRemove << " " << diamonds[elemToRemove] << std::endl;
	-
	game.boardDiamonds.collectField(diamonds[elemToRemove]);
	}


	}

	void Command::freezePlayer(int playerNumber)
	{
	game.players[playerNumber].frozenLeft += 1;
	}

	void Command::processField(int pos)
	{
	if (game.boardDiamonds.ifFieldIsEmpty(pos)==false)
	{
	game.sfx.playCollect();
	if (game.boardDiamonds.getNumberForField(pos)==4)
	{
	game.players[game.turn].cash += 1;

	} else if (game.boardDiamonds.getNumberForField(pos)<4)
	{
	processCard(pos);
	}

	game.boardDiamonds.collectField(pos);
	}
	}

	void Command::processCard(int pos)
	{
	int tokenNumber = game.boardDiamonds.getNumberForField(pos);
	std::string cardType = game.cardsDeck.getTitle(tokenNumber);
	- std::cout << "FOUND CARD " <<cardType << std::endl;
	if (tokenNumber!=game.turn)
	{
	if (cardType == "diamond")
	{
	removeDiamond(game.boardDiamonds.getNumberForField(pos));

	} else if (cardType == "stop")
	{
	freezePlayer(tokenNumber);
	} else if (cardType == "card")
	{
	removeCard(game.boardDiamonds.getNumberForField(pos));

	}
	}
	game.cardsDeck.nextCard(tokenNumber);
	-
	+ game.sfx.playCard();
	}
	diff --git a/game.cpp b/game.cpp
	index 8ab7bc3..f324d97 100644
	--- a/game.cpp
	+++ b/game.cpp
	@@ -1,585 +1,613 @@
	#include "game.h"

	namespace efc {

	int initScreenX = 1360;
	int initScreenY = 768;
	int currentSeason = 0;
	int month = 0;

	void Game::initBoard()
	{

	sfxClick.setBuffer(sfxClickBuffer);
	sfxDone.setBuffer(sfxDoneBuffer);

	spriteBackground.setTexture(textureBackground);
	spriteBackgroundDark.setTexture(textures.backgroundDark);
	spriteBackgroundDark.setPosition(0,0);

	gameBackground.setTexture(textures.textureGameBackground);
	spriteLestBegin.setTexture(textures.textureLetsBegin);
	viewTiles.setViewport(sf::FloatRect(0.15f,0.1f, 1.0f, 1.0f));
	viewGui.setViewport(sf::FloatRect(0.806f,0.066f, 1, 1));

	groupHud.setFont(&gameFont);
	groupHud.setSeason(currentSeason);
	groupHud.setRoundName(roundNumber);

	sf::IntRect seasonsRect[4] = {sf::IntRect(0,0,255,255), sf::IntRect(256,0,512,255), sf::IntRect(0,255, 255, 512), sf::IntRect(255,255,512, 512)};

	sf::Sprite season1;
	season1.setTexture(textures.textureSeasons);
	season1.setTextureRect(seasonsRect[0]);
	season1.setPosition(0,400);
	season1.scale(sf::Vector2f(0.25f, 0.25f));
	season1.move(37.5, 30.5);
	season1.setColor(sf::Color(0,255,0,80));
	seasons[0] = season1;

	sf::Sprite season2;
	season2.setTexture(textures.textureSeasons);
	season2.setTextureRect(seasonsRect[1]);
	season2.setPosition(0,400);
	season2.scale(sf::Vector2f(0.25f, 0.25f));
	season2.move(37.5, 30.5);
	season2.setColor(sf::Color(200,200,50,80));
	seasons[1] = season2;

	sf::Sprite season3;
	season3.setTexture(textures.textureSeasons);
	season3.setTextureRect(seasonsRect[2]);
	season3.setPosition(0,400);
	season3.scale(sf::Vector2f(0.25f, 0.25f));
	season3.move(37.5, 30.5);
	season3.setColor(sf::Color(90,90,255,80));
	seasons[2] = season3;

	sf::Sprite season4;
	season4.setTexture(textures.textureSeasons);
	season4.setTextureRect(seasonsRect[3]);
	season4.setPosition(0,400);
	season4.scale(sf::Vector2f(0.25f, 0.25f));
	season4.move(37.5, 30.5);
	season4.setColor(sf::Color(255,0,0,80));
	seasons[3] = season4;

	// Initialization of the players
	cardsDeck.setFonts(&menuFont);
	PlayerHud playerHud1(&textures, &gameFont, 32,0);
	PlayerHud playerHud2(&textures, &gameFont, 32,1);
	PlayerHud playerHud3(&textures, &gameFont, 32,2);
	PlayerHud playerHud4(&textures, &gameFont, 32,3);
	players[0] = playerHud1;
	players[1] = playerHud2;
	players[3] = playerHud3;
	players[2] = playerHud4;

	players[0].setActive(true);
	setCurrentNeighbours();

	diceResultPlayer = 6;
	players[turn].characters[0].diceResult = diceResultPlayer;
	roundDice.setColor(turn);
	}


	void Game::setCurrentNeighbours ()
	{
	currentNeighbours = players[turn].getNeighbours();
	}

	void Game::loadAssets()
	{
	- if (!textureFaces.loadFromFile("assets/img/faces.jpg"))
	- std::exit(1);
	+// if (!textureFaces.loadFromFile("assets/img/faces.jpg"))
	+// std::exit(1);

	- if (!textureTiles.loadFromFile("assets/img/zw-tilesets/_MAP.png"))
	- std::exit(1);
	+// if (!textureTiles.loadFromFile("assets/img/zw-tilesets/_MAP.png"))
	+// std::exit(1);

	if (!gameFont.loadFromFile("assets/fnt/metal-mania.regular.ttf"))
	{
	std::exit(1);
	}
	if (!menuFont.loadFromFile("assets/fnt/metal-macabre.regular.ttf"))
	{
	std::exit(1);
	}
	if (!textureBackgroundArt.loadFromFile("assets/img/background_land.png"))
	std::exit(1);

	if (!musicGame.openFromFile("assets/audio/game.ogg"))
	std::exit(1);
	if (!musicBackground.openFromFile("assets/audio/wind2.ogg"))
	std::exit(1);
	if (!musicMenu.openFromFile("assets/audio/menu.ogg"))
	std::exit(1);


	if (!sfxClickBuffer.loadFromFile("assets/audio/click.ogg"))
	std::exit(1);

	if (!sfxDoneBuffer.loadFromFile("assets/audio/done.ogg"))
	std::exit(1);
	if (!textureBackground.loadFromFile("assets/img/background.png"))
	std::exit(1);

	spriteBackgroundArt.setTexture(textureBackgroundArt);
	menuTxt.setFont(menuFont);
	menuTxt.setCharacterSize(60);
	menuTxt.setString(gameTitle);
	int width = menuTxt.getLocalBounds().width;
	int height = menuTxt.getLocalBounds().height;
	- menuTxt.setPosition(400-(width/2),300-(height/2)-150);
	+ menuTxt.setPosition(1050-(width/2),750-(height/2)-150);
	menuTxt.setColor(sf::Color(255, 255, 255, 85));
	cardsDeck.setFonts(&gameFont);
	}

	void Game::showMenu()
	{
	musicBackground.play();
	musicBackground.setLoop(true);
	menuBackground.setTexture(textures.textureMenu);
	musicBackground.setVolume(7);
	musicMenu.play();
	musicMenu.setLoop(true);
	currentState = state_menu;
	}
	void Game::hideMenu()
	{
	musicMenu.stop();
	}

	void Game::showGameBoard()
	{
	// musicGame.setVolume(20);
	musicGame.play();
	musicGame.setLoop(true);
	sfx.playLetsBegin();
	std::cout << "lets begin" << std::endl;
	currentState = state_lets_begin;
	}

	void Game::endGame()
	{
	currentState = state_end_game;
	musicBackground.stop();
	}

	void Game::handleLeftClick(sf::Vector2f pos,
	sf::Vector2f posGui, sf::Vector2f posFull, int mousePos) {
	if (currentState==state_game)
	{
	std::array<int,2> movements = players[turn].getMovements(diceResultPlayer);
	if ((mousePos==movements[0]) \|\| (mousePos==movements[1]))
	{
	players[turn].setFigurePos(mousePos);
	commandManager.processField(mousePos);
	int *possibleExit = std::find(std::begin(efc::possibleExits),
	std::end(efc::possibleExits), mousePos);
	if (possibleExit != efc::possibleExits+4) {
	// std::cerr << "Found hahahah" << mousePos << std::endl;
	players[turn].done=true;
	numberFinishedPlayers += 1;
	if (numberFinishedPlayers > 3)
	endGame();
	} else {
	// std::cerr << "Not found" << std::endl;
	}
	nextPlayer();
	}
	// std::string resultCommand = players[turn].getElem(posGui);
	// command(resultCommand);
	}
	else if (currentState==state_roll_dice)
	{
	sf::IntRect diceRect(roundDice.spriteDice.getGlobalBounds());
	if (diceRect.intersects(sf::IntRect(posFull.x, posFull.y, 1, 1)))
	{
	diceResultPlayer = roundDice.throwDiceSix();
	players[turn].characters[0].diceResult=diceResultPlayer;
	currentState=state_game;
	}
	}

	if (currentState==state_menu)
	{
	downTimeCounter = 0;
	// std::cout << " AA " <<downTimeCounter << std::endl;
	hideMenu();
	showGameBoard();
	}



	if (currentState==state_gui_end_round)
	{
	std::string resultCommand = guiRoundDice.getElem(pos);
	command(resultCommand);
	}
	}

	void Game::hideGameBoard()
	{
	musicGame.play();
	}
	Game::Game():
	screenSize(efc::initScreenX,efc::initScreenY),
	- window(sf::VideoMode(efc::initScreenX, efc::initScreenY), "Deerportal - game about how human can be upgraded to the Deer"),
	viewFull(sf::FloatRect(00, 00, screenSize.x, screenSize.y)),
	viewGui(sf::FloatRect(00, 00, screenSize.x, screenSize.y)),
	viewTiles(sf::FloatRect(0, 0, 1360, 768)),
	selector(efc::TILE_SIZE),
	guiSelectBuilding(&textures),
	character(&textures, 3),
	turn(0),
	- gameTitle("pagan board"),
	+ gameTitle("deerportal"),
	roundDice(players),
	roundNumber(1),
	guiRoundDice(&textures),
	boardDiamonds(&textures),
	commandManager(*this),
	- cardsDeck(&textures, &menuFont)
	+ cardsDeck(&textures, &menuFont),
	+ window(sf::VideoMode(efc::initScreenX, efc::initScreenY), "Deerportal - game about how human can be upgraded to the Deer")
	+
	{

	+ textLoading.setString("loading...");
	+ textLoading.setFont(menuFont);
	+ textLoading.setPosition(200,200);
	+ textLoading.setColor(sf::Color::White);
	+ textLoading.setCharacterSize(10);
	+ window.clear(sf::Color::White);
	+ window.draw(textLoading);
	+ window.display();
	+
	+
	numberFinishedPlayers = 0;
	sf::Clock frameClock;
	guiRoundDice.active = true;
	showPlayerBoardElems = false;
	window.setVerticalSyncEnabled(true);

	std::srand (time(NULL));
	+ window.clear(sf::Color(55,55,55));
	+ window.draw(textLoading);
	+ window.display();
	+
	loadAssets();
	+ textLoading.setFont(menuFont);
	+ textLoading.setPosition(200,200);
	+ textLoading.setColor(sf::Color::White);
	+ textLoading.setCharacterSize(10);
	+ window.clear(sf::Color::Black);
	+ window.draw(textLoading);
	+ window.display();
	+
	initBoard();
	+ window.clear(sf::Color::Black);
	+ window.draw(textLoading);
	+ window.display();
	showMenu();
	// run the main loop
	while (window.isOpen())
	{
	sf::Time frameTime = frameClock.restart();
	std::string resultCommand = "";
	// handle events
	sf::Event event;
	while (window.pollEvent(event))
	{
	sf::Vector2i localPositionTmp = sf::Mouse::getPosition(window);
	sf::Vector2f localPosition = window.mapPixelToCoords(localPositionTmp,viewTiles);
	sf::Vector2f localPositionGui = window.mapPixelToCoords(localPositionTmp,viewGui);
	sf::Vector2f localPositionFull = window.mapPixelToCoords(localPositionTmp,viewFull);
	int mousePosX = (int)localPosition.x / efc::TILE_SIZE;
	int mousePosY = (int)localPosition.y / efc::TILE_SIZE;
	int mousePos = efc::transCords(sf::Vector2i(mousePosX, mousePosY));
	if(event.type == sf::Event::Closed)
	window.close();
	if (currentState==state_gui_elem)
	{
	resultCommand = guiSelectBuilding.getElem(localPositionFull);
	showPlayerBoardElems = false;
	if (resultCommand.find("elem_")==0)
	command(resultCommand);
	else
	command("hide_gui_elem_description");
	}

	// Showing mouse hover
	if (currentState==state_game)
	{
	if ((localPosition.x>efc::TILE_SIZEefc::BOARD_SIZE) \|\| (localPosition.x<0) \|\| (localPosition.y>efc::TILE_SIZEefc::BOARD_SIZE) \|\| (localPosition.y<0))
	{
	showPlayerBoardElems = false;
	} else {
	showPlayerBoardElems = true;
	}
	}

	if ((localPosition.x>=0) && (localPosition.y>=0) && (localPosition.x<=efc::BOARD_SIZEefc::TILE_SIZE) && (localPosition.y<=efc::BOARD_SIZEefc::TILE_SIZE))
	{
	selector.setPosition((int) (localPosition.x / efc::TILE_SIZE)efc::TILE_SIZE, ((int) localPosition.y / efc::TILE_SIZE)efc::TILE_SIZE);
	}

	/*!
	* Handling mouse click
	*/
	if (event.type == sf::Event::MouseButtonReleased)
	{
	if (event.mouseButton.button == sf::Mouse::Left)
	handleLeftClick(localPosition, localPositionGui,
	localPositionFull, mousePos);
	}
	}

	update(frameTime);
	render();
	}
	}

	void Game::update(sf::Time frameTime) {
	if (currentState==state_game)
	{
	std::array<int,2> currentMovements = players[turn].getMovements(diceResultPlayer);
	if (currentMovements[0]>-1)
	{
	prevRotateElem.spriteRotate.setPosition(players[turn].characters[0].leftChar.getPosition());
	prevRotateElem.spriteRotate.move(4,16);
	prevRotateElem.update(frameTime);
	prevRotateElem.setColor(turn);
	}
	if (currentMovements[1]>-1)
	{
	nextRotateElem.spriteRotate.setPosition(players[turn].characters[0].rightChar.getPosition());
	nextRotateElem.spriteRotate.move(4,16);
	nextRotateElem.update(frameTime);
	nextRotateElem.setColor(turn);
	}
	}
	for (int i=0;i<4;i++)
	{
	players[i].play();
	}

	for (int i=0;i<4;i++)
	{
	players[i].update(frameTime, busyTiles);
	}

	if (currentState==state_lets_begin)
	{
	downTimeCounter += frameTime.asSeconds();
	spriteLestBegin.setColor(sf::Color(255,255,255,255-(downTimeCounter*35)));
	if (downTimeCounter>6)
	{
	currentState = state_roll_dice;
	}
	}
	}

	void Game::nextRound() {
	turn = 0;
	std::string result = roundDice.drawRound();
	roundNumber += 1;
	month++;
	if (month==13)
	month=1;
	if (month%4==0)
	currentSeason++;
	if (currentSeason>3)
	currentSeason=0;
	if (players[turn].done==true)
	nextPlayer();
	}

	void Game::nextPlayer(){



	if (numberFinishedPlayers==4)
	{
	std::cout << "Everybody Finished!!!" << std::endl;
	endGame();
	}

	if (turn<4)
	players[turn].updatePlayer();
	else
	nextRound();
	turn++;
	+ std::cout << "NEXT PLAYER " << turn << " " << players[turn].frozenLeft << std::endl;

	- if (players[turn].frozenLeft>0)
	- {
	- players[turn].frozenLeft -= 1;
	- nextPlayer();
	- }

	if ((players[turn].done==true) && (turn<4))
	{
	std::cout << "Player " << turn << " is done" << std::endl;
	nextPlayer();
	}

	if ((turn==4) \|\| (turn>4))
	{
	nextRound();
	}

	+ if (players[turn].frozenLeft>0)
	+ {
	+ players[turn].frozenLeft -= 1;
	+ nextPlayer();
	+ }
	+
	selector.changeColor(turn);

	for (int i=0;i<4;i++)
	{
	if (i==turn)
	{
	players[i].setActive(true);
	currentNeighbours = players[i].getNeighbours();
	}
	else
	players[i].setActive(false);
	}

	sfxClick.play();
	diceResultPlayer = 6;
	roundDice.setDiceTexture(diceResultPlayer);
	players[turn].characters[0].diceResult = diceResultPlayer;
	groupHud.setRoundName(roundNumber);
	groupHud.setSeason(currentSeason);
	groupHud.setMonthName(month%4);
	currentState = state_roll_dice;
	roundDice.setColor(turn);
	}

	void Game::drawPlayersGui(){
	for (int i=0;i<4;i++)
	{
	window.draw(players[i]);
	}
	}

	void Game::drawSquares() {
	if (showPlayerBoardElems)
	{
	window.draw(selector);
	}

	}

	void Game::drawBaseGame()
	{
	window.setView(viewTiles);
	// window.draw(map);
	for (int i=0;i<4;i++)
	{
	window.draw(players[i].elems);
	}
	drawSquares();
	window.setView(viewGui);
	window.setView(viewTiles);
	}

	void Game::drawCharacters(){
	window.setView(viewTiles); // Yeah Katia's inspiration
	window.draw(gameBackground);
	window.setView(viewFull);
	window.draw(spriteBackgroundArt);
	window.draw(cardsDeck);
	window.draw(roundDice.spriteDice);
	window.setView(viewTiles);
	drawSquares();

	if (currentState==state_game)
	{
	std::array<int,2> currentMovements = players[turn].characters[0].getMovements(diceResultPlayer);
	if (currentMovements[1]>-1)
	window.draw(nextRotateElem);
	if (currentMovements[0]>-1)
	window.draw(prevRotateElem);
	}
	for (int i=0;i<4;i++)
	{
	for (auto&& j: players[i].characters)
	{
	if (currentState==state_game)
	j.drawMovements = true;
	else
	j.drawMovements = false;
	window.draw(j);
	}
	}
	}

	void Game::render()
	{
	window.clear();
	if (currentState==state_game)
	{
	window.setView(viewFull);
	window.draw(spriteBackgroundDark);
	window.setView(viewTiles);
	drawBaseGame();
	drawCharacters();
	window.draw(boardDiamonds);
	window.setView(viewFull);
	drawPlayersGui();
	window.setView(viewFull);
	window.draw(groupHud);

	} else if (currentState==state_roll_dice) {
	window.setView(viewFull);
	window.draw(spriteBackgroundDark);

	window.setView(viewTiles);
	drawBaseGame();
	drawCharacters();
	window.draw(boardDiamonds);
	window.setView(viewFull);
	drawPlayersGui();
	window.setView(viewFull);
	window.draw(groupHud);

	} else if (currentState==state_gui_elem) {
	window.setView(viewFull);
	window.draw(spriteBackgroundDark);

	drawBaseGame();
	drawCharacters();
	window.draw(guiSelectBuilding);
	window.setView(viewFull);
	window.draw(groupHud);

	} else if (currentState==state_menu) {
	window.draw(menuTxt);
	} else if (currentState==state_lets_begin) {
	window.setView(viewFull);
	window.draw(spriteBackgroundDark);

	window.setView(viewTiles);
	drawBaseGame();
	drawCharacters();
	window.draw(boardDiamonds);
	window.setView(viewFull);
	drawPlayersGui();
	window.draw(spriteLestBegin);

	} else if (currentState==state_gui_end_round){
	window.setView(viewFull);
	window.draw(spriteBackgroundDark);
	drawBaseGame();
	window.draw(guiRoundDice);
	window.setView(viewFull);
	window.draw(groupHud);
	}
	window.display();
	}

	void Game::command(std::string command){
	if (command=="close_gui")
	{
	guiSelectBuilding.active = false;
	currentState=state_game;
	sfxClick.play();
	}
	if (command=="hide_gui_elem_description")
	{
	if (currentState==state_gui_elem) {
	guiSelectBuilding.descriptionActive = false;
	}
	}

	if (command.find("end_of_round")==0)
	{
	std::string subResult = command.substr(13);
	guiRoundDice.active = true;
	guiRoundDice.setTitle(subResult);
	currentState = state_gui_end_round;
	}

	if (command=="end_turn")
	nextPlayer();

	}

	sf::Vector2f Game::getMousePos(){
	sf::Vector2i mousePosTmp(sf::Mouse::getPosition(window));
	sf::Vector2f mousePosition(window.mapPixelToCoords(mousePosTmp,viewTiles));
	return mousePosition;
	}


	}

	diff --git a/game.h b/game.h
	index 019e725..c6e7820 100644
	--- a/game.h
	+++ b/game.h
	@@ -1,185 +1,186 @@
	#ifndef GAME_H
	#define GAME_H
	#include <stdlib.h>
	#include <iostream>
	#include <time.h> /* time */

	#include <SFML/Window.hpp>
	#include <SFML/Graphics.hpp>
	#include <SFML/Audio.hpp>

	#include "command.h"
	#include "tilemap.h"
	#include "selector.h"
	#include "playerhud.h"
	#include "textureholder.h"
	#include "hover.h"
	#include "guichoosebuilding.h"
	#include "guiwindow.h"
	#include "rounddice.h"
	#include "guirounddice.h"
	#include "grouphud.h"
	#include "animatedsprite.h"
	#include "character.h"
	#include "rotateelem.h"
	#include "boarddiamondseq.h"
	#include "soundfx.h"
	#include "cardsdeck.h"

	//class Command;

	namespace efc {

	extern int initScreenX;
	extern int initScreenY;


	class Game
	{

	private:
	sf::Vector2i screenSize;

	public:
	Game();
	sf::RenderWindow window;
	sf::View viewFull;
	sf::View viewGui;
	sf::View viewTiles;
	BoardDiamondSeq boardDiamonds;
	PlayerHud players[4];
	SoundFX sfx;
	int turn;



	private:
	void initBoard();
	void loadAssets();
	void drawPlayersGui();
	void drawSquares();

	void drawMenu();

	sf::Vector2f getMousePos();

	enum states {
	state_init,
	state_menu,
	state_lets_begin,
	state_roll_dice,
	state_game,

	state_gui_elem,
	state_select_building,
	state_gui_end_round,
	state_end_game,
	state_quit
	};

	states currentState;

	sf::Texture textureBackground;
	sf::Sprite spriteBackground;
	sf::Sprite gameBackground;
	sf::Sprite spriteBackgroundDark;

	sf::Sprite spriteLestBegin;

	sf::Texture textureBackgroundArt;
	sf::Sprite spriteBackgroundArt;

	sf::Texture textureTiles;
	sf::Texture textureFaces;
	sf::Font gameFont;
	sf::Font menuFont;
	sf::Text menuTxt;



	TileMap map;

	int mapSize;
	int level[256];
	int levelElems[256];
	TextureHolder textures;
	std::set<int> currentNeighbours;
	void command(std::string command);
	int selectedPos;
	Selector selector;
	GuiChooseBuilding guiSelectBuilding;
	Character character;

	void update(sf::Time frameTime);
	void render();

	std::string gameTitle;

	RoundDice roundDice;
	int roundNumber;


	GuiRoundDice guiRoundDice;
	void setCurrentNeighbours ();
	void nextPlayer();

	void nextRound();


	sf::Sprite menuBackground;
	sf::Sprite seasons[4];
	//int currentSeason = 0;

	sf::Music musicGame;
	sf::Music musicBackground;
	sf::Music musicMenu;

	sf::SoundBuffer sfxClickBuffer;
	sf::Sound sfxClick;

	sf::SoundBuffer sfxDoneBuffer;
	sf::Sound sfxDone;

	void showMenu();

	void hideMenu();
	void showGameBoard();
	void hideGameBoard();


	GroupHud groupHud;

	/*!
	* \brief showPlayerBoardElems defines if show mouse hover for the player
	*/
	bool showPlayerBoardElems;

	void drawBaseGame();
	int month;

	Animation walkingAnimationDown;
	Animation walkingAnimationUp;
	Animation walkingAnimationLeft;
	Animation walkingAnimationRight;
	Animation* currentAnimation;
	AnimatedSprite animatedSprite;

	void drawCharacters();
	void handleLeftClick(sf::Vector2f pos,
	sf::Vector2f posGui, sf::Vector2f posFull, int mousePos);

	std::set<int> busyTiles;

	int diceResultPlayer;
	int numberFinishedPlayers;
	RotateElem nextRotateElem;
	RotateElem prevRotateElem;
	void endGame();

	float downTimeCounter;
	Command commandManager;
	+ sf::Text textLoading;
	public:
	CardsDeck cardsDeck;
	};
	}
	#endif // GAME_H
	diff --git a/playerhud.cpp b/playerhud.cpp
	index dd9ce7b..c2e8494 100644
	--- a/playerhud.cpp
	+++ b/playerhud.cpp
	@@ -1,220 +1,219 @@
	#include "playerhud.h"
	#include "textureholder.h"
	#include "boardelem.h"



	std::set<int> PlayerHud::getTerrainSet(){
	std::set<int> terrain;
	for (int i: efc::terrainArray)
	{
	terrain.insert(i);
	}
	return terrain;

	}
	std::set<int> PlayerHud::getBusy(){

	std::set<int> busyTiles;
	for (std::pair<int, efc::BoardElem> i: elems.items_map)
	{
	busyTiles.insert(i.first);
	}

	return busyTiles;
	}

	std::set<int> PlayerHud::getNeighbours(){
	std::set<int> neighbours;
	for (std::pair<int, efc::BoardElem> i: elems.items_map)
	{
	std::set<int> terrain = getTerrainSet();

	std::set<int> neighboursVector(efc::getNeighbours(i.second.pos));
	for (int j: neighboursVector)
	{
	if ((elems.items_map.count(j) == 0) && (terrain.count(j)==0))
	{
	-// std::cout << j << " " << terrain.count(j) << std::endl;
	+ // std::cout << j << " " << terrain.count(j) << std::endl;
	neighbours.insert(j);
	}
	}
	}

	-// // Fill in s1 and s2 with values
	-// std::set<int> result;
	-// std::set_difference(neighbours.begin(), neighbours.end(), terrain.begin(), terrain.end(),
	-// std::inserter(result, result.end()));
	+ // // Fill in s1 and s2 with values
	+ // std::set<int> result;
	+ // std::set_difference(neighbours.begin(), neighbours.end(), terrain.begin(), terrain.end(),
	+ // std::inserter(result, result.end()));


	-// for (int i: result)
	-// {
	-// std::cout << i << std::endl;
	-// }
	+ // for (int i: result)
	+ // {
	+ // std::cout << i << std::endl;
	+ // }
	return neighbours;
	}

	void PlayerHud::updateTxt(){
	txtCash.setString(std::to_string(cash));
	-// txtFood.setString( "Food: " + std::to_string(food));
	-// txtEnergy.setString("Enrg: " + std::to_string(energy));
	-// txtFaith.setString( "Gods: " + std::to_string(faith));
	+ // txtFood.setString( "Food: " + std::to_string(food));
	+ // txtEnergy.setString("Enrg: " + std::to_string(energy));
	+ // txtFaith.setString( "Gods: " + std::to_string(faith));

	}


	void PlayerHud::updatePlayer(){

	updateTxt();

	}

	PlayerHud::PlayerHud():
	frozenLeft(0)
	{

	}

	void PlayerHud::setActive(bool newState){
	active = newState;
	elems.active = newState;
	for (auto&& i: characters)
	{

	i.active = newState;
	-}
	+ }
	}

	PlayerHud::PlayerHud(TextureHolder textures, sf::Font gameFont, int faceSize, int pos)
	{
	static int startPlayers[4] = {0,15,240,255};

	frozenLeft = 0;
	done = false;

	active = false;
	this->textures = textures;
	Character character(this->textures, pos);
	characters.push_back(Character (this->textures, pos));
	efc::BoardElem startElem(textures, startPlayers[pos],444);
	startElem.setColor(efc::playersColors[pos]);

	elems.items.push_back(startElem);
	elems.items_map.insert({startPlayers[pos], startElem});
	this->faceSize = faceSize;
	spriteFace.setTexture(textures->textureFaces);
	this->pos = pos;


	symbol.setTexture(this->textures->textureSymbols);


	sf::IntRect symbolsRect[4] = {sf::IntRect(0,0,255,255), sf::IntRect(256,0,512,255), sf::IntRect(0,255, 255, 512), sf::IntRect(255,255,512, 512)};


	symbol.setTextureRect(symbolsRect[pos]);
	symbol.setScale(sf::Vector2f(0.2f, 0.20f));
	symbol.setColor(sf::Color(25, 25, 25, 105));
	symbol.setPosition(60, (pos*100)+40);


	food = 0;
	cash = 0;
	energy = 0;
	faith = 0;

	txtCash.setFont(*gameFont);
	txtCash.setCharacterSize(20);

	txtFood.setFont(*gameFont);
	txtEnergy.setFont(*gameFont);
	txtFaith.setFont(*gameFont);

	txtNextRound.setFont(*gameFont);
	txtNextRound.setString("End Turn");
	txtNextRound.setCharacterSize(12);
	txtNextRound.setPosition(40,(pos*100)+10);


	int posX1 = 80;
	int posX2 = 960;
	int posY1 = 184;
	int posY2 = 579;
	std::array<std::array<int,2>,4> textPos =
	{
	{
	{posX1,posY1}, {posX2,posY1},
	{posX1,posY2}, {posX2, posY2}
	}
	};

	txtCash.setPosition(textPos[pos][0],textPos[pos][1] );
	buttons.insert({"end_turn",rectangle});

	}

	std::string PlayerHud::getElem(sf::Vector2f mousePosition) {
	std::string result = "";
	sf::Vector2f hoverPos = getPosition();
	for (std::pair<std::string, sf::RectangleShape> i: buttons)
	{
	sf::FloatRect spriteBounds = i.second.getLocalBounds();
	sf::FloatRect closeRect;
	closeRect.left = i.second.getPosition().x;
	closeRect.top = i.second.getPosition().y;
	closeRect.width = spriteBounds.width;
	closeRect.height = spriteBounds.height;

	if (closeRect.contains(mousePosition.x - hoverPos.x,mousePosition.y - hoverPos.y))
	{
	return i.first;
	}
	}
	return result;
	}

	void PlayerHud::draw(sf::RenderTarget& target, sf::RenderStates states) const
	{
	states.transform *= getTransform();
	target.draw(txtCash, states);
	}
	void PlayerHud::play()
	{
	for (auto&& i: characters)
	{
	i.play();
	}
	}
	void PlayerHud::update(sf::Time deltaTime, std::set<int>& busyTiles)
	{
	updateTxt();
	- for (auto&& i: characters)
	+ if (frozenLeft==0)
	{
	-
	- sf::Vector2f movement(0.f, 0.f);
	- if (i.currentAnimationIndex==efc::DIR_LEFT)
	- movement = sf::Vector2f (-10.f, 0.f);
	- else if (i.currentAnimationIndex==efc::DIR_RIGHT)
	- movement = sf::Vector2f (10.f, 0.f);
	- else if (i.currentAnimationIndex==efc::DIR_UP)
	- movement = sf::Vector2f (0.f, -10.f);
	- else if (i.currentAnimationIndex==efc::DIR_DOWN)
	- movement = sf::Vector2f (0.f, 10.f);
	-
	-// i.move(movement * deltaTime.asSeconds());
	- i.update(deltaTime, busyTiles);
	-
	-
	+ for (auto&& i: characters)
	+ {
	+ sf::Vector2f movement(0.f, 0.f);
	+ if (i.currentAnimationIndex==efc::DIR_LEFT)
	+ movement = sf::Vector2f (-10.f, 0.f);
	+ else if (i.currentAnimationIndex==efc::DIR_RIGHT)
	+ movement = sf::Vector2f (10.f, 0.f);
	+ else if (i.currentAnimationIndex==efc::DIR_UP)
	+ movement = sf::Vector2f (0.f, -10.f);
	+ else if (i.currentAnimationIndex==efc::DIR_DOWN)
	+ movement = sf::Vector2f (0.f, 10.f);
	+ i.update(deltaTime, busyTiles);
	+ }
	+ } else{
	+ characters[0].currentAnimationIndex=efc::DIR_DOWN;
	}
	-
	}

	std::array<int,2> PlayerHud::getMovements(int diceResult)
	{
	return characters[0].getMovements(diceResult);
	}

	void PlayerHud::setFigurePos(int pos)
	{
	characters[0].setBoardPosition(pos);
	}
	diff --git a/soundfx.cpp b/soundfx.cpp
	index 6ee8139..2f1983c 100644
	--- a/soundfx.cpp
	+++ b/soundfx.cpp
	@@ -1,24 +1,35 @@
	#include "soundfx.h"

	SoundFX::SoundFX()
	{
	if (!soundCollectBuffer.loadFromFile("assets/audio/collect.wav"))
	exit(-1);
	+ if (!soundCardBuffer.loadFromFile("assets/audio/card.ogg"))
	+ exit(-1);
	soundCollect.setBuffer(soundCollectBuffer);
	soundCollect.setVolume(20);
	+
	+ soundCard.setBuffer(soundCardBuffer);
	+// soundCollect.setVolume(20);
	+
	if (!soundLetsBeginBuffer.loadFromFile("assets/audio/letsbegin.ogg"))
	exit(-1);
	soundLetsBegin.setBuffer(soundLetsBeginBuffer);
	soundLetsBegin.setVolume(20);
	}

	void SoundFX::playCollect()
	{
	soundCollect.play();
	}

	+void SoundFX::playCard()
	+{
	+ soundCard.play();
	+}
	+
	void SoundFX::playLetsBegin()
	{
	std::cout << "playing.... begin lets" << std::endl;
	soundLetsBegin.play();
	}
	diff --git a/soundfx.h b/soundfx.h
	index 41fa2df..7816a48 100644
	--- a/soundfx.h
	+++ b/soundfx.h
	@@ -1,21 +1,24 @@
	#ifndef SOUNDFX_H
	#define SOUNDFX_H
	#include <iostream>

	#include <SFML/Audio.hpp>

	class SoundFX
	{
	public:
	SoundFX();

	sf::SoundBuffer soundCollectBuffer;
	+ sf::SoundBuffer soundCardBuffer;
	sf::Sound soundCollect;
	+ sf::Sound soundCard;
	void playCollect();

	sf::SoundBuffer soundLetsBeginBuffer;
	sf::Sound soundLetsBegin;
	void playLetsBegin();
	+ void playCard();
	};

	#endif // SOUNDFX_H

File Metadata

Mime Type: text/x-diff
Expires: Fri, Jun 19, 8:36 PM (1 w, 2 d ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 71573
Default Alt Text: (37 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions