No OneTemporary
Actions

Authored By

Unknown

Size

50 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/character.cpp b/character.cpp
	index f9e270f..7c04b53 100644
	--- a/character.cpp
	+++ b/character.cpp
	@@ -1,322 +1,325 @@
	#include "character.h"

	/*!
	* \brief Character::getMovements
	* \return
	*/
	std::array<int,2> Character::getMovements(int howFar)
	{

	- std::array<int,2> myArray;
	+

	if (howFar==7)
	{
	- return std::array<int,2> {-1,-1};
	+ return std::array<int,2> {{-1,-1}};
	}

	+ std::array<int,2> myArray;
	+
	+
	if (active==true)
	{
	// std::cout << "howfar: " <<howFar <<std::endl;
	int indexRight = boardPosition;
	for (int i=boardPosition;i<=boardPosition+howFar-1;i++)
	{

	moveRight = indexRight;
	if (indexRight==-1)
	break;
	indexRight = efc::boards[indexRight][1];
	// std::cout << " howfar" << howFar << " index R" << indexRight
	// << " move L " << moveLeft << " move R " << moveRight << " dice " << diceResult
	// << std::endl;
	if (indexRight==-2)
	{
	indexRight = moveRight;
	break;
	}

	if (indexRight==-1)
	break;
	}

	moveRight = indexRight;

	int indexLeft = boardPosition;
	for (int i=boardPosition;i>=boardPosition-howFar+1;i--)
	{
	moveLeft = indexLeft;

	if (indexLeft==-1)
	break;
	indexLeft = efc::boards[indexLeft][0];
	// std::cout << " howfar" << howFar << " index l " << indexLeft
	// << " move L " << moveLeft << " move R " << moveRight << " dice " << diceResult
	// << std::endl;
	if (indexLeft==-2)
	{
	indexLeft = moveLeft;
	break;
	}
	if (indexLeft==-1)
	break;
	}
	moveLeft = indexLeft;



	myArray = {moveLeft,moveRight};
	}
	else
	{
	myArray = {-1,-1};
	}
	// std::cout << "howfar: " <<howFar << std::endl;
	return myArray;

	}

	void Character::setBoardPosition(int playerNumber)
	{
	Elem::setBoardPosition(playerNumber);
	move(0,-20);

	}



	void Character::setDir(int direction)
	{
	if (direction==efc::DIR_LEFT)
	currentAnimation = &walkingAnimationLeft;
	}



	void Character::setDir()
	{
	setDir(currentAnimationIndex);
	}

	void Character::setDirIndex(int direction)
	{
	currentAnimationIndex = direction;
	}


	void Character::play()
	{
	// animatedSprite.play(*currentAnimation);
	animatedSprite.play(animations[currentAnimationIndex]);
	sf::Vector2f a(getPosition());
	sf::Vector2i position(efc::getCords(a));

	// std::cout << a.x << " " << a.y << " "
	// << position.x << " " << position.y << " pos > "
	// << getBoardPosition() << std::endl;
	}

	Character::Character(TextureHolder *textures, int playerNumber):
	animatedSprite(sf::seconds(0.2), true, false),
	nextRedirect(0.f)
	{

	drawMovements = false;
	this->textures = textures;
	int offset = playerNumber*16;
	active = false;


	rectangleLeft.setFillColor(sf::Color(12, 12, 12,120));
	rectangleLeft.setOutlineColor(sf::Color(24,24,40, 255));
	rectangleRight.setFillColor(sf::Color(240, 240, 240,98));
	rectangleRight.setOutlineColor(sf::Color(24,40,24, 90));



	walkingAnimationDown.setSpriteSheet(textures->textureCharacters);
	walkingAnimationDown.addFrame(sf::IntRect(offset, 0, 16, 24));
	walkingAnimationDown.addFrame(sf::IntRect(offset, 24, 16, 24));

	walkingAnimationRight.setSpriteSheet(textures->textureCharacters);
	walkingAnimationRight.addFrame(sf::IntRect(offset, 48, 16, 24));
	walkingAnimationRight.addFrame(sf::IntRect(offset, 72, 16, 24));

	walkingAnimationLeft.setSpriteSheet(textures->textureCharacters);
	walkingAnimationLeft.addFrame(sf::IntRect(offset, 96, 16, 24));
	walkingAnimationLeft.addFrame(sf::IntRect(offset, 120, 16, 24));

	walkingAnimationUp.setSpriteSheet(textures->textureCharacters);
	walkingAnimationUp.addFrame(sf::IntRect(offset, 144, 16, 24));
	walkingAnimationUp.addFrame(sf::IntRect(offset, 168, 16, 24));

	currentAnimation = &walkingAnimationRight;


	leftChar.setTexture(textures->textureCharacters);
	leftChar.setTextureRect(sf::IntRect(offset, 96, 16, 24));


	rightChar.setTexture(textures->textureCharacters);
	rightChar.setTextureRect(sf::IntRect(offset, 48, 16, 24));

	leftChar.scale(0.75,0.75);
	rightChar.scale(0.75,0.75);

	leftChar.move(202,76);
	rightChar.move(202,76);

	animations[efc::DIR_LEFT] = walkingAnimationLeft;
	animations[efc::DIR_RIGHT] = walkingAnimationRight;
	animations[efc::DIR_UP] = walkingAnimationUp;
	animations[efc::DIR_DOWN] = walkingAnimationDown;


	setDirIndex(efc::DIR_LEFT);
	setDir();

	// sf::Vector2f positions[4] = {
	// sf::Vector2f(0, 0),
	// sf::Vector2f(20, 40),
	// sf::Vector2f(20, 240),
	// sf::Vector2f(40, 240)
	// };

	std::array<int, 4> boardPositions{0,15,255-15,255};
	// std::cout << "define " << playerNumber << std::endl;
	setBoardPosition(boardPositions[playerNumber]);


	}

	void Character::draw(sf::RenderTarget& target, sf::RenderStates states) const
	{

	states.transform *= getTransform();
	target.draw(animatedSprite, states);

	if ((active==true) && (drawMovements==true))
	{
	if (moveLeft>-1)
	{
	target.draw(leftChar);
	}

	if (moveRight>-1)
	{
	target.draw(rightChar);
	}
	}
	}

	void Character::update(sf::Time deltaTime)
	{
	sf::Vector2f a(getPosition());
	sf::Vector2i position(efc::getCords(a));
	nextRedirect -= deltaTime.asSeconds();
	if (nextRedirect<0)
	{
	int number = rand() % 2;
	if ((currentAnimationIndex==efc::DIR_LEFT) \|\| (currentAnimationIndex==efc::DIR_RIGHT))
	{
	if (number==0){
	setDirIndex(efc::DIR_DOWN);
	setDir();
	} else if (number==1)
	{
	setDirIndex(efc::DIR_UP);
	setDir();
	}
	} else if ((currentAnimationIndex==efc::DIR_UP) \|\| (currentAnimationIndex==efc::DIR_DOWN))
	{
	if (number==0){
	setDirIndex(efc::DIR_LEFT);
	setDir();
	} else if (number==1)
	{
	setDirIndex(efc::DIR_RIGHT);
	setDir();
	}
	}

	nextRedirect = rand() % 4;

	}

	if (currentAnimationIndex==efc::DIR_UP)
	{
	if (position.y<2)
	{
	setDirIndex(efc::DIR_DOWN);
	setDir();
	}
	} else if (currentAnimationIndex==efc::DIR_DOWN)
	{
	if (position.y>efc::BOARD_SIZE-1)
	{
	setDirIndex(efc::DIR_UP);
	setDir();
	}
	} else if (currentAnimationIndex==efc::DIR_LEFT)
	{

	if (position.x<2)
	{
	setDirIndex(efc::DIR_RIGHT);
	setDir();
	}
	} else if (currentAnimationIndex==efc::DIR_RIGHT)
	{
	if (position.x>efc::BOARD_SIZE-1)
	{
	setDirIndex(efc::DIR_LEFT);
	setDir();
	}
	}
	animatedSprite.update(deltaTime);

	std::array<int,2> movements(getMovements(diceResult));
	// int left = movements[0];
	// int right = movements[1];


	if (active==true)
	{
	if (moveLeft>-1)
	{
	// sf::Vector2i cordsLeft(efc::transPosition(moveLeft));
	sf::Vector2i neededCords(efc::transPosition(moveLeft));

	sf::Vector2f newPos(efc::getScreenPos(neededCords));
	leftChar.setPosition(newPos.x+efc::TILE_SIZE/4,newPos.y);

	leftChar.move(202,76);
	}


	if (moveRight>-1)
	{
	// sf::Vector2i cordsRight(efc::transPosition(moveRight));
	sf::Vector2i neededCords(efc::transPosition(moveRight));

	sf::Vector2f newPos(efc::getScreenPos(neededCords));
	rightChar.setPosition(newPos.x+efc::TILE_SIZE/4,newPos.y);
	rightChar.move(202,76);

	}

	// std::cout << " dice " << diceResult<< moveLeft << " " << moveRight << std::endl;
	}


	}

	sf::FloatRect Character::getLocalBounds() const
	{

	return sf::FloatRect(0.f, 0.f, 0, 0);
	}

	sf::FloatRect Character::getGlobalBounds() const
	{
	return getTransform().transformRect(getLocalBounds());
	}

	diff --git a/game.cpp b/game.cpp
	index 3824a13..93bfee1 100644
	--- a/game.cpp
	+++ b/game.cpp
	@@ -1,910 +1,911 @@
	#include "game.h"
	#include "particle.h"
	#include "calendar.h"


	namespace efc {

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


	void Game::setTxtEndGameAmount(){


	std::string elementNames[4] = {"Water","Earth", "Fire", "Air"};

	int width=1360;
	// int height = 768;

	int separator = 40;

	for (int i=0;i<4;i++)
	{
	std::string label = elementNames[i]+ " " + std::to_string(players[i].cash);
	endGameTxtAmount[i].setString(label);
	sf::FloatRect ss = endGameTxtAmount[i].getLocalBounds();
	endGameTxtAmount[i].setPosition((width/2)-(ss.width/2),separator+(i*separator));

	}




	}

	void Game::initBoard()
	{


	time_t t = time(0);
	struct tm * now = localtime( & t );
	int month = now->tm_mon + 1;
	int day = now->tm_mday;
	paganHolidayString = getHoliday(month, day);
	// std::cout << "HOLIDAY"<< paganHolidayString << std::endl;
	paganHolidayTxt.setString(paganHolidayString);


	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(&gameFont);
	restartGame();


	for (int i=0;i<4;i++)
	{
	endGameTxtAmount[i].setFont(gameFont);
	endGameTxtAmount[i].setCharacterSize(25);


	}

	endGameTxt.setFont(gameFont);
	endGameTxt.setString("Game Over");
	endGameTxt.setCharacterSize(30);


	sf::FloatRect ss = endGameTxt.getLocalBounds();



	endGameTxt.setPosition((1360/2)-(ss.width/2),0);

	setTxtEndGameAmount();
	bubble.setPosition(players[turn].characters[0].getPosition().x-30,
	players[turn].characters[0].getPosition().y-45);
	// endGameTxt.set
	// endGameTxt.setScale(2,2);

	}

	void Game::restartGame()
	{

	PlayerHud playerHud1(&textures, &gameFont,0);
	PlayerHud playerHud2(&textures, &gameFont,1);
	PlayerHud playerHud3(&textures, &gameFont,2);
	PlayerHud playerHud4(&textures, &gameFont,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);

	for (int i=0;i<4;i++)
	{
	players[i].restartPlayer();
	boardDiamonds.reorder(i);

	}
	turn = 0;
	currentSeason = 1;
	month = 0;
	cardsDeck.reloadCards();
	}

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

	void Game::loadAssets()
	{

	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 (!shaderBlur.loadFromFile("assets/shaders/blur.frag", sf::Shader::Fragment))
	std::exit(1);

	if (!shaderPixel.loadFromFile("assets/shaders/pixelate.frag", sf::Shader::Fragment))
	std::exit(1);
	if (!shaderDark.loadFromFile("assets/shaders/dark.frag", sf::Shader::Fragment))
	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(1050-(width/2),750-(height/2)-150);
	menuTxt.setColor(sf::Color(255, 255, 255, 85));
	cardsDeck.setFonts(&gameFont);

	paganHolidayTxt.setFont(menuFont);
	paganHolidayTxt.setCharacterSize(20);
	paganHolidayTxt.setPosition(20,20);


	for (int i=0;i<4;i++)
	{
	playersSprites[i].setTexture(textureBackgroundArt);
	playersSprites[i].setTextureRect(sf::IntRect(playersSpritesCords[i][0],
	playersSpritesCords[i][1], 280, 280));
	playersSprites[i].setPosition(playersSpritesCords[i][0], playersSpritesCords[i][1]);
	}


	}

	void Game::showMenu()
	{
	// musicBackgroun/d/.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;
	downTimeCounter = 0;
	setTxtEndGameAmount();
	// musicBackground.stop();
	}

	void Game::handleLeftClick(sf::Vector2f pos,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);
	const int *possibleExit = std::find(std::begin(efc::endPlayers),
	std::end(efc::endPlayers), mousePos);
	if (possibleExit != efc::endPlayers+4) {
	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);
	// commandManager.processGui(posGui);
	}
	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;
	bubble.state = BubbleState::MOVE;
	}
	}

	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);
	}

	if (currentState==state_lets_begin)
	{
	if (downTimeCounter>1)
	{
	currentState = state_roll_dice;
	}

	}

	if (currentState==state_end_game)
	{
	if (downTimeCounter>2)
	{
	currentState = state_menu;
	restartGame();
	}

	}


	}

	void Game::hideGameBoard()
	{
	musicGame.play();
	}
	Game::Game():
	screenSize(efc::initScreenX,efc::initScreenY),
	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),
	character(&textures, 3),
	gameTitle("deerportal"),
	roundDice(players),
	roundNumber(1),
	guiRoundDice(&textures),
	boardDiamonds(&textures),

	window(sf::VideoMode(efc::initScreenX, efc::initScreenY), "Deerportal - game about how human can be upgraded to the Deer"),
	turn(0),
	particleSystem( 430, 230),


	commandManager(*this),
	cardsDeck(&textures, &menuFont,&commandManager)
	{


	//particleSystem.setPosition( width/2, height/2 );
	//particleSystem.setGravity( 1.0f, 1.0f );
	//particleSystem.setParticleSpeed( 80.0f );
	particleSystem.setDissolve( true );
	particleSystem.setDissolutionRate( 10 );
	particleSystem.setShape( Shape::CIRCLE );

	particleSystem.fuel( 1000 );
	playersSpritesCords[0][0] = 202;
	playersSpritesCords[0][1] = 76;
	playersSpritesCords[1][0] = 562;
	playersSpritesCords[1][1] = 76;
	playersSpritesCords[3][0] = 202;
	playersSpritesCords[3][1] = 436;
	playersSpritesCords[2][0] = 562;
	playersSpritesCords[2][1] = 436;
	textLoading.setString("loading...");
	textLoading.setFont(menuFont);
	textLoading.setPosition(200,200);
	textLoading.setColor(sf::Color::White);
	textLoading.setCharacterSize(10);
	renderTexture.create(1360,768);
	renderTexture.clear(sf::Color::White);
	renderTexture.draw(textLoading);
	renderTexture.display();

	renderSprite.setTexture(renderTexture.getTexture());
	numberFinishedPlayers = 0;
	sf::Clock frameClock;
	guiRoundDice.active = true;
	showPlayerBoardElems = false;
	window.setVerticalSyncEnabled(true);

	std::srand (time(NULL));
	window.clear(sf::Color(55,55,55));
	renderTexture.draw(textLoading);
	window.display();

	loadAssets();
	textLoading.setFont(menuFont);
	textLoading.setPosition(200,200);
	textLoading.setColor(sf::Color::White);
	textLoading.setCharacterSize(10);
	renderTexture.clear(sf::Color::Black);
	renderTexture.draw(textLoading);
	window.display();

	initBoard();
	renderTexture.clear(sf::Color::Black);
	renderTexture.draw(textLoading);
	renderTexture.display();


	showMenu();
	// currentState = state_end_game; //TODO: hacky debug hy


	// run the main loop
	while (window.isOpen())
	{
	sf::Time frameTime = frameClock.restart();
	// std::string resultCommand = "";
	// handle events
	sf::Event event;
	float xpos = 320.0f;
	float ypos = 240.0f;
	float xgrv = 0.0f;
	float ygrv = 0.0f;



	while (window.pollEvent(event))
	{
	switch (event.type) {
	case sf::Event::Closed:
	window.close(); break;
	case sf::Event::KeyPressed:
	if(event.key.code == sf::Keyboard::Escape )
	window.close();
	if( sf::Keyboard::isKeyPressed( sf::Keyboard::Space ) )
	particleSystem.fuel( 200/* * window.getFrameTime() */);
	if( sf::Keyboard::isKeyPressed( sf::Keyboard::A ) )
	particleSystem.setPosition( --xpos, ypos );
	if( sf::Keyboard::isKeyPressed( sf::Keyboard::D ) )
	particleSystem.setPosition( ++xpos, ypos );
	if( sf::Keyboard::isKeyPressed( sf::Keyboard::W ) )
	particleSystem.setPosition( xpos, --ypos );
	if( sf::Keyboard::isKeyPressed( sf::Keyboard::S ) )
	particleSystem.setPosition( xpos, ++ypos );
	if( sf::Keyboard::isKeyPressed( sf::Keyboard::Left ) )
	particleSystem.setGravity( --xgrv * 0.1f, ygrv * 0.1f);
	if( sf::Keyboard::isKeyPressed( sf::Keyboard::Right ) )
	particleSystem.setGravity( ++xgrv * 0.1f, ygrv * 0.1f );
	if( sf::Keyboard::isKeyPressed( sf::Keyboard::Up ) )
	particleSystem.setGravity( xgrv * 0.1f, --ygrv * 0.1f );
	if( sf::Keyboard::isKeyPressed( sf::Keyboard::Down ) )
	particleSystem.setGravity( xgrv * 0.1f, ++ygrv * 0.1f );
	if( sf::Keyboard::isKeyPressed( sf::Keyboard::G ) )
	particleSystem.setGravity( 0.0f, 0.0f );
	if( sf::Keyboard::isKeyPressed( sf::Keyboard::P ) )
	particleSystem.setPosition( 320.0f, 240.0f );
	break;
	default:
	break;

	}

	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,
	localPositionFull, mousePos);
	}
	}

	update(frameTime);
	render(frameTime.asSeconds());
	}
	}

	void Game::update(sf::Time frameTime) {
	runningCounter += frameTime.asSeconds();
	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.spriteRotate.move(-202,-76);

	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.spriteRotate.move(-202,-76);
	nextRotateElem.update(frameTime);
	nextRotateElem.setColor(turn);
	}
	}
	cardsDeck.update(frameTime);
	for (int i=0;i<4;i++)
	{

	players[i].play();
	players[i].update(frameTime);
	}

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

	if (currentState==state_end_game)
	{
	downTimeCounter += frameTime.asSeconds();

	}

	}

	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 (currentState==state_end_game)
	{
	return;
	}



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

	}

	if (turn<4)
	players[turn].updatePlayer();
	else
	nextRound();
	turn++;
	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;
	bubble.state = BubbleState::DICE;
	roundDice.setColor(turn);
	bubble.setPosition(players[turn].characters[0].getPosition().x-30,
	players[turn].characters[0].getPosition().y-45);
	}

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

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

	}

	void Game::drawBaseGame()
	{


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

	void Game::drawCharacters(){
	renderTexture.setView(viewTiles); // Yeah Katia's inspiration

	shaderBlur.setParameter("blur_radius", sin(runningCounter*0.01) );

	renderTexture.draw(gameBackground);
	renderTexture.setView(viewFull);
	renderTexture.draw(spriteBackgroundArt, &shaderDark);
	spriteBackgroundArt.setColor(sf::Color(255, 255, 255, 208));
	shaderBlur.setParameter("blur_radius", 0.5);
	// shaderBlur.setParameter("blur_radius", sin(runningCounter*0.01) );
	// shaderBlur.setParameter("blur_radius", sin(runningCounter*0.01) );
	shaderPixel.setParameter("pixel_threshold", sin(runningCounter* 0.05));

	renderTexture.draw(spriteBackgroundArt);
	spriteBackgroundArt.setColor(sf::Color(255, 255, 255));
	shaderBlur.setParameter("blur_radius", sin(runningCounter* 0.05)/2);

	// for (int i=0;i<4;i++)
	// {

	// sf::RectangleShape rectangle(sf::Vector2f(284, 284));
	// rectangle.setPosition(playersSpritesCords[i][0]-2,playersSpritesCords[i][1]-2);
	// rectangle.setFillColor(sf::Color(0, 0, 0,55));
	// renderTexture.draw(rectangle);
	// if (turn==i)
	// renderTexture.draw(playersSprites[i]);
	// else
	// renderTexture.draw(playersSprites[i], &shaderBlur);



	// }
	renderTexture.draw(cardsDeck);
	if (currentState==state_roll_dice)
	{
	spriteBackgroundArt.setColor(sf::Color(255, 255, 255));
	shaderBlur.setParameter("blur_radius", sin(runningCounter* 0.5)/4);
	renderTexture.draw(roundDice.spriteDice, &shaderBlur);
	}
	else
	renderTexture.draw(roundDice.spriteDice);
	renderTexture.setView(viewTiles);
	drawSquares();

	if (currentState==state_game)
	{
	std::array<int,2> currentMovements = players[turn].characters[0].getMovements(diceResultPlayer);
	if (currentMovements[1]>-1)
	renderTexture.draw(nextRotateElem);
	if (currentMovements[0]>-1)
	renderTexture.draw(prevRotateElem);
	}

	renderTexture.setView(viewFull);
	shaderBlur.setParameter("blur_radius", 0.005);


	for (int i=0;i<4;i++)
	{
	for (auto&& j: players[i].characters)
	{
	if (currentState==state_game)
	j.drawMovements = true;
	else
	j.drawMovements = false;
	renderTexture.draw(j, &shaderBlur);
	}
	}
	}



	void Game::render(float deltaTime)
	{
	window.clear();
	renderTexture.clear();
	if (currentState==state_game)
	{
	renderTexture.setView(viewFull);
	shaderBlur.setParameter("blur_radius", 2);

	renderTexture.draw(spriteBackgroundDark, &shaderBlur);

	renderTexture.setView(viewTiles);
	drawBaseGame();
	drawCharacters();
	renderTexture.draw(boardDiamonds);
	renderTexture.draw(bubble);

	renderTexture.setView(viewFull);
	drawPlayersGui();
	renderTexture.setView(viewFull);
	renderTexture.draw(groupHud);

	} else if (currentState==state_roll_dice) {
	renderTexture.setView(viewFull);
	shaderBlur.setParameter("blur_radius", 2);
	renderTexture.draw(spriteBackgroundDark, &shaderBlur);
	renderTexture.setView(viewTiles);
	drawBaseGame();
	drawCharacters();

	renderTexture.draw(boardDiamonds);
	renderTexture.draw(bubble);

	renderTexture.setView(viewFull);
	drawPlayersGui();
	renderTexture.setView(viewFull);
	renderTexture.draw(groupHud);

	} else if (currentState==state_gui_elem) {
	renderTexture.setView(viewFull);
	shaderBlur.setParameter("blur_radius", 2);
	renderTexture.draw(spriteBackgroundDark, &shaderBlur);

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

	} else if (currentState==state_menu) {
	shaderBlur.setParameter("blur_radius", 15);
	renderTexture.draw(menuTxt, &shaderBlur);
	renderTexture.draw(menuTxt);
	renderTexture.draw(paganHolidayTxt);
	// window.draw(menuTxt);
	} else if (currentState==state_lets_begin) {
	renderTexture.setView(viewFull);
	shaderBlur.setParameter("blur_radius", 4);
	renderTexture.draw(spriteBackgroundDark, &shaderBlur);
	renderTexture.setView(viewTiles);
	drawBaseGame();
	drawCharacters();
	renderTexture.draw(boardDiamonds, &shaderBlur);
	renderTexture.setView(viewFull);
	drawPlayersGui();
	renderTexture.draw(spriteLestBegin,&shaderBlur);

	} else if (currentState==state_gui_end_round){
	renderTexture.setView(viewFull);
	renderTexture.draw(spriteBackgroundDark);
	drawBaseGame();
	shaderBlur.setParameter("blur_radius", 0.05);
	renderTexture.draw(guiRoundDice, &shaderBlur);
	renderTexture.setView(viewFull);
	renderTexture.draw(groupHud);
	}


	else if (currentState==state_end_game){
	renderTexture.setView(viewFull);
	renderTexture.draw(spriteBackgroundDark);
	renderTexture.draw(spriteLestBegin,&shaderBlur);
	renderTexture.draw(endGameTxt);

	for (int i=0;i<4;i++){
	renderTexture.draw(endGameTxtAmount[i]);
	}

	// drawBaseGame();

	}




	renderTexture.display();
	renderSprite.setTexture(renderTexture.getTexture());

	shaderBlur.setParameter("blur_radius", sin(deltaTime)*0.015);
	shaderBlur.setParameter("blur_radius", 0.0003);
	window.draw(renderSprite, &shaderBlur);


	particleSystem.remove();
	particleSystem.update();
	particleSystem.render();
	window.draw( particleSystem.getSprite() );


	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.compare("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/particlesystem.cpp b/particlesystem.cpp
	index df12532..3e9d231 100644
	--- a/particlesystem.cpp
	+++ b/particlesystem.cpp
	@@ -1,111 +1,112 @@
	#include "particle.h"
	#include <sstream>

	ParticleSystem::ParticleSystem( int width, int height )
	{
	m_transparent = sf::Color( 0, 0, 0, 0 );
	m_image.create( width, height, m_transparent );
	m_texture.loadFromImage(m_image);
	m_sprite = sf::Sprite(m_texture);
	m_position.x = 0.5f * width;
	m_position.y = 0.5f * height;
	m_particleSpeed = 20.0f;
	m_dissolve = false;
	m_dissolutionRate = 4;
	m_shape = Shape::CIRCLE;
	}

	ParticleSystem::~ParticleSystem()
	{
	- for( ParticleIterator it = m_particles.begin(); it != m_particles.end(); it++ )
	- for( ParticleIterator it = m_particles.begin(); it != m_particles.end(); it++ )
	+ for( ParticleIterator it = m_particles.begin(); it != m_particles.end(); ++it )
	+ for( ParticleIterator it = m_particles.begin(); it != m_particles.end(); ++it )
	{
	delete *it;
	}
	}

	void ParticleSystem::fuel( int particles )
	{
	float angle;
	- Particle* particle;
	+
	for( int i = 0; i < particles; i++ )
	{
	+ Particle* particle;
	particle = new Particle();
	particle->pos.x = m_position.x;
	particle->pos.y = m_position.y;

	switch( m_shape )
	{
	case Shape::CIRCLE:
	angle = m_randomizer.rnd(0.0f, 6.2832f);
	particle->vel.x = m_randomizer.rnd(0.0f, cos( angle ));
	particle->vel.y = m_randomizer.rnd(0.0f, sin( angle ));
	break;
	case Shape::SQUARE:
	particle->vel.x = m_randomizer.rnd(-1.0f, 1.0f);
	particle->vel.y = m_randomizer.rnd(-1.0f, 1.0f);
	break;
	default:
	particle->vel.x = 0.5f; // Easily detected
	particle->vel.y = 0.5f; // Easily detected
	}

	if( particle->vel.x == 0.0f && particle->vel.y == 0.0f )
	{
	delete particle;
	continue;
	}
	particle->color.r = m_randomizer.rnd(0, 255);
	particle->color.g = m_randomizer.rnd(0, 255);
	particle->color.b = m_randomizer.rnd(0, 255);
	particle->color.a = 255;
	m_particles.push_back( particle );
	}
	}

	void ParticleSystem::update()
	{
	float time = m_clock.restart().asSeconds();

	- for( ParticleIterator it = m_particles.begin(); it != m_particles.end(); it++ )
	+ for( ParticleIterator it = m_particles.begin(); it != m_particles.end(); ++it )
	{
	(it)->vel.x += m_gravity.x time;
	(it)->vel.y += m_gravity.y time;

	(it)->pos.x += (it)->vel.x * time * m_particleSpeed;
	(it)->pos.y += (it)->vel.y * time * m_particleSpeed;

	if( m_dissolve ) (*it)->color.a -= m_dissolutionRate;

	if( (it)->pos.x > m_image.getSize().x \|\| (it)->pos.x < 0 \|\| (it)->pos.y > m_image.getSize().y \|\| (it)->pos.y < 0 \|\| (*it)->color.a < 10 )
	{
	delete (*it);
	it = m_particles.erase( it );
	if( it == m_particles.end() ) return;
	}
	}
	}

	void ParticleSystem::render()
	{
	- for( ParticleIterator it = m_particles.begin(); it != m_particles.end(); it++ )
	+ for( ParticleIterator it = m_particles.begin(); it != m_particles.end(); ++it )
	{
	m_image.setPixel( (int)(it)->pos.x, (int)(it)->pos.y, (*it)->color );
	}
	m_texture.update(m_image);
	}

	void ParticleSystem::remove()
	{
	- for( ParticleIterator it = m_particles.begin(); it != m_particles.end(); it++ )
	+ for( ParticleIterator it = m_particles.begin(); it != m_particles.end(); ++it )
	{
	m_image.setPixel( (int)(it)->pos.x, (int)(it)->pos.y, m_transparent );
	}
	}

	std::string ParticleSystem::getNumberOfParticlesString()
	{
	std::ostringstream oss;
	oss << m_particles.size();
	return oss.str();
	}
	diff --git a/playerhud.cpp b/playerhud.cpp
	index 4b898c0..cf5b4d0 100644
	--- a/playerhud.cpp
	+++ b/playerhud.cpp
	@@ -1,245 +1,245 @@
	#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;
	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()));


	// 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));

	}


	void PlayerHud::updatePlayer(){

	updateTxt();

	}

	PlayerHud::PlayerHud():
	frozenLeft(0)
	{
	pos = 0;
	cash = 0;
	energy = 0;
	food = 0;
	faith = 0;
	active = false;
	done = false;
	tileSize = 0;
	textures = nullptr;

	// unchanged playerhud.cpp 72 warning uninitMemberVar false Member variable 'PlayerHud::pos' is not initialized in the constructor.
	// unchanged playerhud.cpp 72 warning uninitMemberVar false Member variable 'PlayerHud::cash' is not initialized in the constructor.
	// unchanged playerhud.cpp 72 warning uninitMemberVar false Member variable 'PlayerHud::energy' is not initialized in the constructor.
	// unchanged playerhud.cpp 72 warning uninitMemberVar false Member variable 'PlayerHud::food' is not initialized in the constructor.
	// unchanged playerhud.cpp 72 warning uninitMemberVar false Member variable 'PlayerHud::faith' is not initialized in the constructor.
	// unchanged playerhud.cpp 72 warning uninitMemberVar false Member variable 'PlayerHud::active' is not initialized in the constructor.
	// unchanged playerhud.cpp 72 warning uninitMemberVar false Member variable 'PlayerHud::done' is not initialized in the constructor.
	// unchanged playerhud.cpp 72 warning uninitMemberVar false Member variable 'PlayerHud::faceSize' is not initialized in the constructor.
	// unchanged playerhud.cpp 72 warning uninitMemberVar false Member variable 'PlayerHud::tileSize' is not initialized in the constructor.
	// unchanged playerhud.cpp 72 warning uninitMemberVar false Member variable 'PlayerHud::textures' is not initialized in the constructor.

	}

	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 pos)
	{


	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, efc::startPlayers[pos],444);
	// startElem.setColor(efc::playersColors[pos]);

	// elems.items.push_back(startElem);
	// elems.items_map.insert({efc::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 = 82;
	int posX2 = 962;
	int posY1 = 22;
	int posY2 = 720;
	std::array<std::array<int,2>,4> textPos =
	{
	{
	- {posX1,posY1}, {posX2,posY1},
	- {posX1,posY2}, {posX2, posY2}
	+ {{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)
	{
	updateTxt();
	if (frozenLeft==0)
	{
	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);
	}
	} 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);
	}

	void PlayerHud::restartPlayer(){
	food = 0;
	cash = 0;
	energy = 0;
	faith = 0;
	}
	diff --git a/rounddice.cpp b/rounddice.cpp
	index 44da31b..32e026e 100644
	--- a/rounddice.cpp
	+++ b/rounddice.cpp
	@@ -1,76 +1,76 @@
	#include "rounddice.h"

	RoundDice::RoundDice(PlayerHud (&players)[4])
	{
	playersHud = players;
	diceResult = 1;
	diceResultSix = 6;
	diceSize = 150;
	if (!sfxDiceBuffer.loadFromFile("assets/audio/dice.ogg"))
	std::exit(1);

	if (!textureDice.loadFromFile("assets/img/diceWhite.png"))
	std::exit(1);

	spriteDice.setTexture(textureDice);

	sfxDice.setBuffer(sfxDiceBuffer);
	sfxDice.setVolume(12);
	spriteDice.setPosition(1140,550);
	setDiceTexture();
	}

	void RoundDice::setDiceTexture(){
	sf::IntRect diceRect(diceSize*diceResultSix, 0, diceSize, diceSize);
	spriteDice.setTextureRect(diceRect);
	}

	void RoundDice::setColor(int playerNumber){
	sf::Color color(efc::playersColors[playerNumber]);
	spriteDice.setColor(color);
	}

	void RoundDice::setDiceTexture(int diceResult){
	this->diceResultSix = diceResult;
	setDiceTexture();
	}

	std::string RoundDice::drawRound(){
	throwDice();
	if (diceResult<33)
	{
	return "end_of_round_extra_grow";
	} else if (diceResult<66)
	{
	return "end_of_round_extra_energy";
	} else
	{
	- eventExtraCash();
	+// eventExtraCash();
	return "end_of_round_extra_cash";
	}
	return "end_of_round_"+std::to_string(diceResult);
	}

	int RoundDice::throwDice(){
	sfxDice.play();
	int result = rand()%100;
	diceResult = result;
	return result;
	}

	int RoundDice::throwDiceSix(){
	sfxDice.play();
	int result = rand()%6;
	diceResultSix = result;
	setDiceTexture();
	return result+1;
	}

	-void RoundDice::eventExtraCash(){
	+//void RoundDice::eventExtraCash(){

	-// for (int i=0;i<4;i++)
	-// {
	-// playersHud[i].cash += 20;
	-// playersHud[i].updateTxt();
	-// }
	-}
	+//// for (int i=0;i<4;i++)
	+//// {
	+//// playersHud[i].cash += 20;
	+//// playersHud[i].updateTxt();
	+//// }
	+//}
	diff --git a/rounddice.h b/rounddice.h
	index 076c6d4..d7f2381 100644
	--- a/rounddice.h
	+++ b/rounddice.h
	@@ -1,41 +1,41 @@
	#ifndef ROUNDDICE_H
	#define ROUNDDICE_H
	#include <random>
	#include <SFML/Audio.hpp>
	#include <SFML/Graphics.hpp>
	#include "playerhud.h"



	class RoundDice
	{
	public:
	explicit RoundDice(PlayerHud (&players)[4]);
	PlayerHud *playersHud;


	std::string drawRound();
	int diceResult;
	int diceResultSix;
	int throwDiceSix();
	sf::Texture textureDice;
	sf::Sprite spriteDice;
	void setDiceTexture();
	void setDiceTexture(int diceResult);

	void setColor(int playerNumber);

	private:
	int throwDice();


	int diceSize;

	- void eventExtraCash();
	+// void eventExtraCash();

	sf::SoundBuffer sfxDiceBuffer;
	sf::Sound sfxDice;

	};

	#endif // ROUNDDICE_H

File Metadata

Mime Type: text/x-diff
Expires: Wed, Jun 17, 9:12 PM (1 w, 5 d ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 70318
Default Alt Text: (50 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions