No OneTemporary
Actions

Authored By

Unknown

Size

51 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/boarddiamond.cpp b/boarddiamond.cpp
	index e833528..f313253 100644
	--- a/boarddiamond.cpp
	+++ b/boarddiamond.cpp
	@@ -1,41 +1,33 @@
	#include "boarddiamond.h"

	BoardDiamond::BoardDiamond()
	{
	idNumber = 0;
	playerNumber = 0;
	textures = nullptr;
	}

	BoardDiamond::BoardDiamond(TextureHolder *textures, int idNumber,
	int playerNumber, int boardPosition)
	{
	this->textures = textures;
	this->playerNumber = playerNumber;
	this->boardPosition = boardPosition;
	this->idNumber = idNumber;
	spriteHolder.setTexture(this->textures->textureBoardDiamond);
	sf::IntRect textureRect(idNumber*44, 0, 44,44);
	spriteHolder.setTextureRect(textureRect);
	spriteHolder.scale(0.5, 0.5);
	setBoardPosition(boardPosition);
	}

	-
	-
	void BoardDiamond::draw(sf::RenderTarget& target, sf::RenderStates states) const
	{
	if (boardPosition>-1)
	{
	states.transform *= getTransform();
	- sf::Vector2f where(getPosition());
	target.draw(spriteHolder, states);
	}
	}

	-//void BoardDiamond::update(sf::Time deltaTime, std::set<int> &busyTiles)
	-//{
	-
	-//}
	-

	diff --git a/card.cpp b/card.cpp
	index 8477ec6..b50ba96 100644
	--- a/card.cpp
	+++ b/card.cpp
	@@ -1,12 +1,10 @@
	#include "card.h"

	Card::Card():
	cardTitle("CARD")
	{
	elementNumber = -1;
	id = -1;
	amount = -1;
	cardTypeInt = 0;
	-
	-
	}
	diff --git a/character.cpp b/character.cpp
	index c1fc376..433ba51 100644
	--- a/character.cpp
	+++ b/character.cpp
	@@ -1,290 +1,283 @@
	#include "character.h"

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


	std::array<int,2> myArray = {{-1,-1}};


	if (howFar==7)
	{

	return myArray;
	}

	// std::array<int,2> myArray;


	if (active==true)
	{
	int indexRight = boardPosition;
	for (int i=boardPosition;i<=boardPosition+howFar-1;i++)
	{

	moveRight = indexRight;
	if (indexRight==-1)
	break;
	indexRight = efc::boards[indexRight][1];
	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];
	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.2f), true, false),
	nextRedirect(0.f)
	{

	drawMovements = false;
	this->textures = textures;
	int offset = playerNumber*32;
	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));

	int charWidth = 32;
	int charHeight = 58;


	walkingAnimationDown.setSpriteSheet(textures->textureCharacters);
	walkingAnimationDown.addFrame(sf::IntRect(offset, 0, charWidth, charHeight));
	walkingAnimationDown.addFrame(sf::IntRect(offset, 58, charWidth, charHeight));

	walkingAnimationRight.setSpriteSheet(textures->textureCharacters);
	walkingAnimationRight.addFrame(sf::IntRect(offset, 116, charWidth, charHeight));
	walkingAnimationRight.addFrame(sf::IntRect(offset, 174, charWidth, charHeight));

	walkingAnimationLeft.setSpriteSheet(textures->textureCharacters);
	walkingAnimationLeft.addFrame(sf::IntRect(offset, 232, charWidth, charHeight));
	walkingAnimationLeft.addFrame(sf::IntRect(offset, 290, charWidth, charHeight));

	walkingAnimationUp.setSpriteSheet(textures->textureCharacters);
	walkingAnimationUp.addFrame(sf::IntRect(offset, 348, charWidth, charHeight));
	walkingAnimationUp.addFrame(sf::IntRect(offset, 406, charWidth, charHeight));

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

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

	void Character::draw(sf::RenderTarget& target, sf::RenderStates states) const
	{
	states.transform *= getTransform();
	target.draw(animatedSprite, states);
	}

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

	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/command.cpp b/command.cpp
	index 4785cc5..69231ac 100644
	--- a/command.cpp
	+++ b/command.cpp
	@@ -1,156 +1,155 @@
	#include <algorithm>
	#include <iterator>
	#include "game.h"
	#include "command.h"
	#include "data.h"

	Command::Command(efc::Game &currentGame) :
	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::vector<int> diamonds;
	for (auto&& i: game.boardDiamonds.diamonds)
	{
	int fieldNumber = i.playerNumber;
	if ((fieldNumber==playerNumber) && (i.boardPosition>-1)
	&& (i.idNumber<4))
	{
	diamonds.push_back(i.boardPosition);
	}
	}
	int numberDiamonds = diamonds.size();
	if (numberDiamonds>=0)
	{
	int elemToRemove = rand() % numberDiamonds;
	game.boardDiamonds.collectField(diamonds[elemToRemove]);
	}
	}

	void Command::removeAllCardElement(int elementNumber)
	{
	/*! 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::vector<int> diamonds;
	for (auto&& i: game.boardDiamonds.diamonds)
	{
	int cardElementNumber = i.idNumber;
	if ((i.boardPosition>-1) && (cardElementNumber==elementNumber))
	{
	i.boardPosition=-1;
	};
	}

	}

	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::vector<int> diamonds;
	for (auto&& i: game.boardDiamonds.diamonds)
	{
	int fieldNumber = i.playerNumber;
	if ((fieldNumber==playerNumber) && (i.boardPosition>-1)
	&& (i.idNumber==4))
	{
	diamonds.push_back(i.boardPosition);
	}
	}
	int numberDiamonds = diamonds.size();
	if (numberDiamonds>=0)
	{
	int elemToRemove = rand() % numberDiamonds;
	game.boardDiamonds.collectField(diamonds[elemToRemove]);
	}
	}

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

	void Command::processField(int pos)
	{
	// if ()
	bool startField = std::find(std::begin(efc::startPlayers),
	std::end(efc::startPlayers), pos)
	!= std::end(efc::startPlayers);

	if ((startField) && (efc::startPlayers[game.turn]==pos))
	game.boardDiamonds.reorder(game.turn);

	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);
	if (tokenNumber!=game.turn)
	{
	if (cardType == "diamond")
	{
	removeDiamond(game.boardDiamonds.getNumberForField(pos));
	game.players[game.turn].cash += 1;

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

	} else if (cardType == "diamond x 2")
	{
	removeDiamond(game.boardDiamonds.getNumberForField(pos));
	game.players[game.turn].cash += 1;
	removeDiamond(game.boardDiamonds.getNumberForField(pos));
	game.players[game.turn].cash += 1;

	}
	}
	game.cardsDeck.nextCard(tokenNumber);
	game.sfx.playCard();
	}

	//int Command::processGui(sf::Vector2f posGui)
	//{
	// return posGui.x + posGui.y; /! TODO: add processing some actions /
	//}
	diff --git a/data.cpp b/data.cpp
	index bf0979c..f2fe8a7 100644
	--- a/data.cpp
	+++ b/data.cpp
	@@ -1,162 +1,127 @@
	#include <data.h>

	namespace efc {

	std::string seasonsNames[4] = {"winter", "spring", "summer", "fall"};

	// This array defines fields occupied by the river
	int terrainArray[24] = {
	8, 24, 40, 56, 72, 88,
	113, 114, 115, 116, 117, 118,
	138, 139, 140, 141, 142, 143,
	167, 183, 199, 215, 231, 247
	};
	/*
	* 0
	* 16
	* 32
	* 48
	* 64
	* 80
	* 96
	* 112
	* 128
	* 144
	* 160
	* 176
	* 192
	*/


	std::array<std::array<int,2>,256> boards = {
	{
	{-1,1}, {0,2}, {1,3}, {2,4}, {3,5}, {4,21}, {-1,-1}, {-1,-1}, {-1,-1}, {-1,-1}, {11,26}, {12,10}, {13,11}, {14,12}, {15,13}, {-1,14},
	{-1,-1}, {18,33}, {19,17}, {20,18}, {21,19}, {5,20}, {-1,-1}, {-1,-1}, {-1,-1}, {-1,-1}, {10, 27,}, {26,28}, {27,29}, {28,30}, {29,46}, {-1,-1},
	{33,48}, {17,32}, {-1,-1}, {51,36}, {35,37}, {36,38}, {37,54}, {-1,-1}, {-1,-1}, {-1,-1}, {43,58}, {44,42}, {60,43}, {-1,-1}, {30,47}, {46,63},
	{32,49}, {48,50}, {49,51}, {50,35}, {-1,-1}, {54,69}, {38,53}, {-1,-1}, {-1,-1}, {58,73}, {42,57}, {-1,-1}, {61,44}, {62,60}, {63,61}, {47,62},
	{65,80}, {66,64}, {67,65}, {68,66}, {69,67}, {53,68}, {-1,-1}, {-1,-1}, {-1,-1}, {57,74}, {73,75}, {74,76}, {75,77}, {76,78}, {77,79}, {78,95},
	{64,81}, {80,97}, {-1,-1}, {99,84}, {83,85}, {84,101}, {-1,-1}, {-1,-1}, {-1,-1}, {90,105}, {91,89}, {92,90}, {108,91}, {-1,-1}, {95,110}, {79,94},
	{-1,-1}, {81,98}, {97,99}, {98,83}, {-1,-1}, {85,102}, {101,118}, {-1,-1}, {105,120}, {89,104}, {-1,-1}, {-1,-1}, {109,92}, {110,108}, {94,109}, {-1,-1},
	{-1,-1}, {-1,-1}, {-1,-1}, {-1,-1}, {-1,-1}, {-1,-1}, {102, 119},{118,-2}, {104,-2}, {-1,-1}, {-1,-1}, {-1,-1}, {-1,-1}, {-1,-1}, {-1,-1}, {-1,-1},
	{-1,-1}, {-1,-1}, {-1,-1}, {-1,-1}, {-1,-1}, {-1,-1}, {-1,-1} , {151,-2}, {137,-2}, {153,136}, {-1,-1}, {-1,-1}, {-1,-1}, {-1,-1}, {-1,-1}, {-1,-1},
	{-1,-1}, {161,146}, {145,147}, {146,163}, {-1,-1}, {-1,-1}, {166,151}, {150,135} ,{-1,-1}, {154,137}, {170,153}, {-1,-1}, {157,172}, {158,156}, {174,157}, {-1,-1},
	{176,161},{160,145}, {-1,-1}, {147,164}, {163,165}, {164,166}, {165,150}, {-1,-1}, {-1,-1}, {-1,-1}, {171,154}, {172,170}, {156,171}, {-1,-1}, {175,158}, {191,174},
	{177,160},{178,176}, {179,177}, {180,178}, {181,179}, {182,180}, {198,181}, {-1,-1}, {-1,-1}, {-1,-1}, {202,187}, {186,188}, {187,189}, {188,190}, {189,191}, {190,175},
	{208,193},{192,194}, {193,195}, {194,211}, {-1,-1}, {213,198}, {197,182}, {-1,-1}, {-1,-1}, {217,202}, {201,186}, {-1,-1}, {205,220}, {206,204}, {207,205}, {223,206},
	{209,192},{225,208}, {-1,-1}, {195,212}, {211,213}, {212,197}, {-1,-1}, {-1,-1}, {-1,-1}, {218,201}, {219,217}, {220,218}, {204,219}, {-1,-1}, {238,223}, {222,207},
	{-1,-1}, {226,209}, {227,225}, {228,226}, {229,227}, {245,228}, {-1,-1}, {-1,-1}, {-1,-1}, {-1,-1}, {250,235}, {234,236}, {235,237}, {236,238}, {237,222}, {-1,-1},
	{-1,241}, {240,242},{241,243}, {242,244}, {243,245}, {244,229}, {-1,-1}, {-1,-1}, {-1,-1}, {-1,-1}, {251,234}, {252,250}, {253,251}, {254,252}, {255,253}, {-1,254},
	},
	};
	std::array<std::array<int,numberSteps>,4> occupiedFields =
	{
	{
	{1,2,3,4,5,17,18,19,20,21,32,33,35,36,37,38,48,49,50,51,53,54,64,65,66,67,68,69,80,81,83,84,85,97,98,99,101,102,118},
	{10,11,12,13,14,26,27,28,29,30,42,43,44,46,47,57,58,60,61,62,63,73,74,75,76,77,78,79,89,90,91,92,94,95,104,105,108,109,110},
	{145,146,147,150,151,160,161,163,164,165,166,176,177,178,179,180,181,182,192,193,194,195,197,198,208,209,211,212,213,225,226,227,228,229,241,242,243,244,245},
	{137,153,154,156,157,158,170,171,172,174,175,186,187,188,189,190,191,201,202,204,205,206,207,217,218,219,220,222,223,234,235,236,237,238,250,251,252,253,254}
	}
	};
	-//{8,813}, {24, 803}, {40, 803}, {56, 803}, {72, 803} ,{88, 801},
	-//{167,809}, {183, 803}, {199, 803}, {215, 803}, {231, 803} ,{247, 8},
	-//{8,813}, {24, 803}, {40, 803}, {56, 803}, {72, 803} ,{88, 801},
	-//{8,813}, {24, 803}, {40, 803}, {56, 803}, {72, 803} ,{88, 801},
	-
	-//level[8] = 813;
	-//level[24] = 803;
	-//level[40] = 803;
	-//level[56] = 803;
	-//level[72] = 803;
	-//level[88] = 801;
	-
	-//level[167] = 809;
	-//level[183] = 803;
	-//level[199] = 803;
	-//level[215] = 803;
	-//level[231] = 803;
	-//level[247] = 812;
	-
	-//level[112] = 811;
	-//for (int i=113;i<117;i++)
	-// level[i] = 816;
	-//level[117] = 815;
	-
	-//level[138] = 800;
	-//for (int i=139;i<143;i++)
	-// level[i] = 816;
	-//level[143] = 814;
	-
	-// Colors for the board elements
	-//sf::Color playersColors[4] = {
	-// sf::Color(0, 150,255,255),
	-// sf::Color(50, 230,50,255),
	-// sf::Color(230, 50,50,255),
	-// sf::Color(150, 150,150,255)
	-//};
	+

	sf::Color playersColors[4] = {
	sf::Color(122, 185,246,255),
	sf::Color(144, 226,106,255),
	sf::Color(255, 163,142,255),
	sf::Color(250, 255,117,255),

	};

	std::array<std::array<int,3>,efc::diamondsNumber> DIAMONDS_SETUP =
	{
	{
	- {0,0,-1},{0,0,-1},
	- {1,0,-1},{1,0,-1},
	- {2,0,-1},{2,0,-1},
	- {3,0,-1},{3,0,-1},
	- {4,0,-1},{4,0,-1},{4,0,-1},{4,0,-1},{4,0,-1},{4,0,-1},
	+ {0,0,-1},{0,0,-1},
	+ {1,0,-1},{1,0,-1},
	+ {2,0,-1},{2,0,-1},
	+ {3,0,-1},{3,0,-1},
	+ {4,0,-1},{4,0,-1},{4,0,-1},{4,0,-1},{4,0,-1},{4,0,-1},
	{0,0,-1},{0,0,-1},
	{1,0,-1},{1,0,-1},
	{2,0,-1},{2,0,-1},
	{3,0,-1},{3,0,-1},
	{4,0,-1},{4,0,-1},{4,0,-1},{4,0,-1},{4,0,-1},{4,0,-1},

	- {0,1,-1},{0,1,-1},
	- {1,1,-1},{1,1,-1},
	- {2,1,-1},{2,1,-1},
	- {3,1,-1},{3,1,-1},
	- {4,1,-1},{4,1,-1},{4,1,-1},{4,1,-1},{4,1,-1},{4,1,-1},
	+ {0,1,-1},{0,1,-1},
	+ {1,1,-1},{1,1,-1},
	+ {2,1,-1},{2,1,-1},
	+ {3,1,-1},{3,1,-1},
	+ {4,1,-1},{4,1,-1},{4,1,-1},{4,1,-1},{4,1,-1},{4,1,-1},
	{0,1,-1},{0,1,-1},
	{1,1,-1},{1,1,-1},
	{2,1,-1},{2,1,-1},
	{3,1,-1},{3,1,-1},
	{4,1,-1},{4,1,-1},{4,1,-1},{4,1,-1},{4,1,-1},{4,1,-1},



	- {0,3,-1},{0,3,-1},
	- {1,3,-1},{1,3,-1},
	- {2,3,-1},{2,3,-1},
	- {3,3,-1},{3,3,-1},
	- {4,3,-1},{4,3,-1},{4,3,-1},{4,3,-1},{4,3,-1},{4,3,-1},
	+ {0,3,-1},{0,3,-1},
	+ {1,3,-1},{1,3,-1},
	+ {2,3,-1},{2,3,-1},
	+ {3,3,-1},{3,3,-1},
	+ {4,3,-1},{4,3,-1},{4,3,-1},{4,3,-1},{4,3,-1},{4,3,-1},
	{0,3,-1},{0,3,-1},
	{1,3,-1},{1,3,-1},
	{2,3,-1},{2,3,-1},
	{3,3,-1},{3,3,-1},
	{4,3,-1},{4,3,-1},{4,3,-1},{4,3,-1},{4,3,-1},{4,3,-1},


	- {0,2,-1},{0,2,-1},
	- {1,2,-1},{1,2,-1},
	- {2,2,-1},{2,2,-1},
	- {3,2,-1},{3,2,-1},
	- {4,2,-1},{4,2,-1},{4,2,-1},{4,2,-1},{4,2,-1},{4,2,-1},
	+ {0,2,-1},{0,2,-1},
	+ {1,2,-1},{1,2,-1},
	+ {2,2,-1},{2,2,-1},
	+ {3,2,-1},{3,2,-1},
	+ {4,2,-1},{4,2,-1},{4,2,-1},{4,2,-1},{4,2,-1},{4,2,-1},
	{0,2,-1},{0,2,-1},
	{1,2,-1},{1,2,-1},
	{2,2,-1},{2,2,-1},
	{3,2,-1},{3,2,-1},
	{4,2,-1},{4,2,-1},{4,2,-1},{4,2,-1},{4,2,-1},{4,2,-1},



	}
	} ;


	}

	diff --git a/game.cpp b/game.cpp
	index 4ce48a1..b00b107 100644
	--- a/game.cpp
	+++ b/game.cpp
	@@ -1,964 +1,968 @@
	#include "game.h"
	#include "particle.h"
	#include "calendar.h"


	namespace efc {

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


	struct ResultTable
	{
	int playerNumber;
	int playerResult;
	ResultTable(int number,int result) : playerNumber(number), playerResult(result) {}
	bool operator < (const ResultTable& otherResult) const
	{
	return (playerResult > otherResult.playerResult);
	}
	};


	void Game::setTxtEndGameAmount(){


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

	int width=1360;
	// int height = 768;
	int separator = 40;
	std::array<ResultTable, 4> results = {
	{
	ResultTable(0,players[0].cash),
	ResultTable(1,players[1].cash),
	ResultTable(2,players[2].cash),
	ResultTable(3,players[3].cash)
	}
	};

	// std::array <int, 4> results = {{players[0].cash,players[1].cash,players[2].cash,players[3].cash}};



	std::vector < ResultTable > resultsVector;
	for (int i=0;i<4;i++)
	{
	resultsVector.push_back(results[i]);
	};

	std::sort(resultsVector.begin(), resultsVector.end());


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

	int playerNumber = resultsVector[i].playerNumber;
	std::string elementName = elementNames[playerNumber];

	std::string label = elementName+ " " + std::to_string(players[playerNumber].cash);
	endGameTxtAmount[i].setString(label);
	sf::FloatRect ss = endGameTxtAmount[i].getLocalBounds();
	endGameTxtAmount[i].setPosition((width/2)-(ss.width/2),separator+(i*separator));



	// 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(gameFont);
	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(gameFont);
	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(10,20);
	+
	+ // Modificator to fit on the bigger view
	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(10,20);
	+
	+ // Modificator to fit on the bigger view
	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();

	}

	bubble.update(frameTime);
	}

	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);
	renderTexture.setView(viewTiles); // Yeah Katia's inspiration
	shaderBlur.setParameter("blur_radius", sin(runningCounter*0.01f) );

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

	renderTexture.draw(spriteBackgroundArt);
	spriteBackgroundArt.setColor(sf::Color(255, 255, 255));
	shaderBlur.setParameter("blur_radius", sin(runningCounter* 0.05f)/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.5f)/4);
	renderTexture.draw(roundDice.spriteDice, &shaderBlur);
	}
	else
	renderTexture.draw(roundDice.spriteDice);
	renderTexture.setView(viewTiles);
	drawSquares();

	}

	void Game::drawCharacters(){


	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.005f);


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





	renderTexture.setView(viewTiles);
	drawBaseGame();
	renderTexture.setView(viewFull);
	renderTexture.draw(groupHud);
	renderTexture.setView(viewTiles);
	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();
	renderTexture.setView(viewFull);
	renderTexture.draw(groupHud);
	renderTexture.setView(viewTiles);
	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.05f);
	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.015f);
	shaderBlur.setParameter("blur_radius", 0.0003f);
	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/rotateelem.cpp b/rotateelem.cpp
	index 22933d5..fea53b3 100644
	--- a/rotateelem.cpp
	+++ b/rotateelem.cpp
	@@ -1,31 +1,32 @@
	#include "rotateelem.h"

	RotateElem::RotateElem()
	{
	if (!textureRotate.loadFromFile("assets/img/rotate.png"))
	std::exit(1);

	spriteRotate.setTexture(textureRotate);
	- spriteRotate.scale(0.4f,0.4f);
	+ spriteRotate.scale(0.7f,0.7f);
	spriteRotate.setOrigin(32, 32);

	}

	void RotateElem::draw(sf::RenderTarget& target, sf::RenderStates states) const{
	states.transform *= getTransform();
	target.draw(spriteRotate, states);
	}
	void RotateElem::update(sf::Time deltaTime)
	{

	float speed;

	speed = 0.05f/deltaTime.asSeconds();

	spriteRotate.rotate(1.0f*speed);
	}

	void RotateElem::setColor(int playerNumber)
	{
	- spriteRotate.setColor(efc::playersColors[playerNumber]);
	+// spriteRotate.setColor(efc::playersColors[playerNumber]);
	+ spriteRotate.setColor(sf::Color::White);
	}

File Metadata

Mime Type: text/x-diff
Expires: Mon, Jun 15, 11:24 PM (2 w, 3 d ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 69993
Default Alt Text: (51 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions