No OneTemporary
Actions

Authored By

Unknown

Size

101 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/BaseCreatureEntity.cpp b/src/BaseCreatureEntity.cpp
	index 9a279a6..fb380f3 100644
	--- a/src/BaseCreatureEntity.cpp
	+++ b/src/BaseCreatureEntity.cpp
	@@ -1,149 +1,149 @@
	#include "BaseCreatureEntity.h"
	#include "sfml_game/ImageManager.h"
	#include "Constants.h"

	#include "WitchBlastGame.h"

	BaseCreatureEntity::BaseCreatureEntity(sf::Texture* image, float x = 0.0f, float y = 0.0f, int spriteWidth = -1, int spriteHeight = -1)
	: CollidingSpriteEntity (image, x, y, spriteWidth, spriteHeight )
	{
	hurting = false;
	- hurtingType = BoltStandard;
	+ hurtingType = ShotTypeStandard;
	shadowFrame = -1;
	setMap(game().getCurrentMap(), TILE_WIDTH, TILE_HEIGHT, OFFSET_X, OFFSET_Y);
	hpDisplay = 0;
	for (int i = 0; i < NB_SPECIAL_STATES; i++)
	{
	specialState[i].type = (enumSpecialState)i;
	specialState[i].resistance = ResistanceStandard;
	specialState[i].active = false;
	specialState[i].timer = 0.0f;
	}
	}

	int BaseCreatureEntity::getHp()
	{
	return hp;
	}

	int BaseCreatureEntity::getHpMax()
	{
	return hpMax;
	}

	void BaseCreatureEntity::setHp(int hp)
	{
	this->hp = hp;
	}

	void BaseCreatureEntity::setHpMax(int hpMax)
	{
	this->hpMax = hpMax;
	}

	int BaseCreatureEntity::getHpDisplay()
	{
	return hpDisplay;
	}

	void BaseCreatureEntity::animate(float delay)
	{
	if (hpDisplay > hp) hpDisplay--;
	else if (hpDisplay < hp) hpDisplay++;

	for (int i = 0; i < NB_SPECIAL_STATES; i++)
	{
	if (specialState[i].active)
	{
	specialState[i].timer -= delay;
	if (specialState[i].timer <= 0.0f) specialState[i].active = false;
	}
	}

	if (specialState[SpecialStateIce].active) delay *= STATUS_FROZEN_MULT;

	z = y + height/2;
	sprite.setColor(sf::Color(255, 255, 255, 255 ));
	if (hurting)
	{
	hurtingDelay -= delay;
	if (hurtingDelay > 0.0f)
	{
	int fadeColor = (sf::Uint8)((HURTING_DELAY - hurtingDelay) * 255);
	- if (hurtingType == BoltIce)
	+ if (hurtingType == ShotTypeIce)
	sprite.setColor(sf::Color(fadeColor, fadeColor, 255, 255 ));
	else
	sprite.setColor(sf::Color(255, fadeColor, fadeColor, 255 ));
	}
	else
	{
	hurting = false;
	sprite.setColor(sf::Color(255, 255, 255, 255 ));
	}
	}
	CollidingSpriteEntity::animate(delay);

	if (specialState[SpecialStateIce].active) sprite.setColor(sf::Color(100, 100, 255, 255 ));
	}

	void BaseCreatureEntity::render(sf::RenderWindow* app)
	{
	if (!isDying && shadowFrame > -1)
	{
	// shadow
	sprite.setTextureRect(sf::IntRect(shadowFrame * width, 0, width, height));
	app->draw(sprite);
	}
	CollidingSpriteEntity::render(app);

	#ifdef SHOW_BOUNDING_BOX
	sf::Vertex line[] =
	{
	sf::Vertex(sf::Vector2f(boundingBox.left, boundingBox.top)),
	sf::Vertex(sf::Vector2f(boundingBox.left + boundingBox.width, boundingBox.top)),
	sf::Vertex(sf::Vector2f(boundingBox.left + boundingBox.width, boundingBox.top)),
	sf::Vertex(sf::Vector2f(boundingBox.left + boundingBox.width, boundingBox.top + boundingBox.height)),
	sf::Vertex(sf::Vector2f(boundingBox.left + boundingBox.width, boundingBox.top + boundingBox.height)),
	sf::Vertex(sf::Vector2f(boundingBox.left, boundingBox.top + boundingBox.height)),
	sf::Vertex(sf::Vector2f(boundingBox.left, boundingBox.top + boundingBox.height)),
	sf::Vertex(sf::Vector2f(boundingBox.left, boundingBox.top))
	};
	app->draw(line, 8, sf::Lines);
	#endif
	}

	void BaseCreatureEntity::calculateBB()
	{
	}

	-bool BaseCreatureEntity::hurt(int damages, enumBoltType hurtingType)
	+bool BaseCreatureEntity::hurt(int damages, enumShotType hurtingType)
	{
	hurting = true;
	hurtingDelay = HURTING_DELAY;
	this->hurtingType = hurtingType;

	- if (hurtingType == BoltIce && specialState[SpecialStateIce].resistance > ResistanceImmune)
	+ if (hurtingType == ShotTypeIce && specialState[SpecialStateIce].resistance > ResistanceImmune)
	{
	specialState[SpecialStateIce].active = true;
	specialState[SpecialStateIce].timer = STATUS_FROZEN_DELAY;
	}

	hp -= damages;
	if (hp <= 0)
	{
	hp = 0;
	prepareDying();
	}

	return true;
	}

	void BaseCreatureEntity::prepareDying()
	{
	dying();
	}

	void BaseCreatureEntity::dying()
	{
	isDying = true;
	}
	diff --git a/src/BaseCreatureEntity.h b/src/BaseCreatureEntity.h
	index f219a73..69c8db1 100644
	--- a/src/BaseCreatureEntity.h
	+++ b/src/BaseCreatureEntity.h
	@@ -1,53 +1,53 @@
	#ifndef BASECREATUREENTITY_H
	#define BASECREATUREENTITY_H

	#include "sfml_game/CollidingSpriteEntity.h"
	#include "Constants.h"

	const int NB_SPECIAL_STATES = 1;

	class BaseCreatureEntity : public CollidingSpriteEntity
	{
	public:
	BaseCreatureEntity(sf::Texture* image, float x, float y, int spriteWidth, int spriteHeight);
	int getHp();
	int getHpMax();
	void setHp(int hp);
	void setHpMax(int hpMax);
	int getHpDisplay();
	virtual void animate(float delay);
	virtual void render(sf::RenderWindow* app);
	virtual void calculateBB();
	- virtual bool hurt(int damages, enumBoltType hurtingType);
	+ virtual bool hurt(int damages, enumShotType hurtingType);
	virtual void prepareDying();
	virtual void dying();
	enum enumBloodColor { bloodRed, bloodGreen};
	enum enumSpecialState
	{
	SpecialStateIce // = 0
	};
	enum enumStateResistance { ResistanceImmune, ResistanceResistant, ResistanceStandard, ResistanceLow, ResistanceVeryLow};
	struct itemStuct
	{
	enumSpecialState type;
	enumStateResistance resistance;
	bool active;
	float timer;
	};
	itemStuct specialState[NB_SPECIAL_STATES];

	protected:
	int hp;
	int hpMax;
	int hpDisplay;
	float creatureSpeed;
	int shadowFrame;

	bool hurting;
	float hurtingDelay;
	- enumBoltType hurtingType;
	+ enumShotType hurtingType;
	enumBloodColor bloodColor;
	private:
	};

	#endif // BASECREATUREENTITY_H
	diff --git a/src/BoltEntity.cpp b/src/BoltEntity.cpp
	index 6050905..d7e3540 100644
	--- a/src/BoltEntity.cpp
	+++ b/src/BoltEntity.cpp
	@@ -1,146 +1,146 @@
	#include "BoltEntity.h"
	#include "Constants.h"
	#include "sfml_game/ImageManager.h"
	#include "sfml_game/SoundManager.h"

	-BoltEntity::BoltEntity(sf::Texture* image, float x, float y, float boltLifeTime, enumBoltType boltType) : CollidingSpriteEntity (image, x, y, BOLT_WIDTH, BOLT_HEIGHT)
	+BoltEntity::BoltEntity(sf::Texture* image, float x, float y, float boltLifeTime, enumShotType boltType) : CollidingSpriteEntity (image, x, y, BOLT_WIDTH, BOLT_HEIGHT)
	{
	lifetime = boltLifeTime;
	setDamages(INITIAL_BOLT_DAMAGES);
	type = ENTITY_BOLT;
	viscosity = 0.97f;
	frame = 0;
	this->boltType = boltType;
	- if (boltType == BoltIce) frame = 2;
	+ if (boltType == ShotTypeIce) frame = 2;
	}

	int BoltEntity::getDamages()
	{
	return damages;
	}

	void BoltEntity::setDamages(int damages)
	{
	this->damages = damages;

	if (damages <= 4) renderScale = 0.8f;
	else if (damages <= 8) renderScale = 0.85f;
	else if (damages <= 12) renderScale = 0.9f;
	else if (damages <= 16) renderScale = 1.0f;
	else if (damages <= 20) renderScale = 1.1f;
	else if (damages <= 24) renderScale = 1.2f;
	else if (damages <= 30) renderScale = 1.3f;
	else renderScale = 1.4f;

	sprite.scale(renderScale, renderScale);
	}

	-enumBoltType BoltEntity::getBoltType()
	+enumShotType BoltEntity::getBoltType()
	{
	return boltType;
	}

	void BoltEntity::animate(float delay)
	{
	SpriteEntity* trace = new SpriteEntity(ImageManager::getImageManager()->getImage(IMAGE_BOLT), x, y, BOLT_WIDTH, BOLT_HEIGHT);
	trace->setFading(true);
	trace->setZ(y);
	trace->setLifetime(0.2f);
	trace->setShrinking(true, renderScale, renderScale);
	trace->setType(16);
	trace->setFrame(frame);

	z = y + height;
	//if (viscosity < 1.0f && ((velocity.x)(velocity.x) + (velocity.y)(velocity.y)) < 900.0f) viscosity = 1.0f;

	CollidingSpriteEntity::animate(delay);

	if ( (lifetime - age) < 0.2f)
	{
	if (age >= lifetime)
	sprite.setColor(sf::Color(255, 255, 255, 0));
	else
	sprite.setColor(sf::Color(255, 255, 255, (sf::Uint8)((lifetime - age) / 0.2f * 255)));
	}

	if (((velocity.x)(velocity.x) + (velocity.y)(velocity.y)) < 1500.0f) isDying = true;
	}

	void BoltEntity::collide()
	{
	isDying = true;
	for (int i=0; i<5; i++)
	{
	Vector2D vel(40.0f + rand() % 50);
	generateParticule(vel);
	}
	}

	void BoltEntity::generateParticule(Vector2D vel)
	{
	SpriteEntity* trace = new SpriteEntity(ImageManager::getImageManager()->getImage(IMAGE_BOLT), x, y, BOLT_WIDTH, BOLT_HEIGHT);
	trace->setFading(true);
	trace->setZ(y);
	trace->setLifetime(0.5f);
	trace->setScale(0.3f, 0.3f);
	trace->setVelocity(vel);
	trace->setViscosity(0.97f);
	trace->setType(16);
	trace->setFrame(frame);
	}

	void BoltEntity::collideMapRight()
	{
	velocity.x = 0.0f;
	isDying = true;

	SoundManager::getSoundManager()->playSound(SOUND_WALL_IMPACT);
	for (int i=0; i<5; i++)
	{
	Vector2D vel(100.0f + rand() % 150);
	if (vel.x > 0.0f) vel.x = - vel.x;
	generateParticule(vel);
	}
	}

	void BoltEntity::collideMapLeft()
	{
	velocity.x = 0.0f;
	isDying = true;

	SoundManager::getSoundManager()->playSound(SOUND_WALL_IMPACT);
	for (int i=0; i<5; i++)
	{
	Vector2D vel(100.0f + rand() % 150);
	if (vel.x < 0.0f) vel.x = - vel.x;
	generateParticule(vel);
	}
	}

	void BoltEntity::collideMapTop()
	{
	velocity.y = 0.0f;
	isDying = true;

	SoundManager::getSoundManager()->playSound(SOUND_WALL_IMPACT);
	for (int i=0; i<5; i++)
	{
	Vector2D vel(100.0f + rand() % 150);
	if (vel.y < 0.0f) vel.y = - vel.y;
	generateParticule(vel);
	}
	}

	void BoltEntity::collideMapBottom()
	{
	velocity.y = 0.0f;
	isDying = true;

	SoundManager::getSoundManager()->playSound(SOUND_WALL_IMPACT);
	for (int i=0; i<5; i++)
	{
	Vector2D vel(100.0f + rand() % 150);
	if (vel.y > 0.0f) vel.y = - vel.y;
	generateParticule(vel);
	}
	}
	diff --git a/src/BoltEntity.h b/src/BoltEntity.h
	index 1170149..6a7b99b 100644
	--- a/src/BoltEntity.h
	+++ b/src/BoltEntity.h
	@@ -1,37 +1,37 @@
	#ifndef BOLTENTITY_H
	#define BOLTENTITY_H

	#include "sfml_game/CollidingSpriteEntity.h"
	#include "Constants.h"

	/*! \class BoltEntity
	* \brief bolt thrown by the player
	*
	* BoltEntity are the missile weapons thrown by the player.
	* The can collide with an enemy (to hurt him) or with the walls.
	*/
	class BoltEntity : public CollidingSpriteEntity
	{
	public:
	- BoltEntity(sf::Texture* image, float x, float y, float boltLifeTime, enumBoltType boltType);
	+ BoltEntity(sf::Texture* image, float x, float y, float boltLifeTime, enumShotType boltType);
	virtual void animate(float delay);
	void collide();
	void generateParticule(Vector2D vel);

	int getDamages();
	void setDamages(int damages);
	- enumBoltType getBoltType();
	+ enumShotType getBoltType();

	protected:
	virtual void collideMapRight();
	virtual void collideMapLeft();
	virtual void collideMapTop();
	virtual void collideMapBottom();

	int damages;
	float renderScale;
	- enumBoltType boltType;
	+ enumShotType boltType;
	private:
	};

	#endif // BOLTENTITY_H
	diff --git a/src/Constants.h b/src/Constants.h
	index 239dc94..c414722 100644
	--- a/src/Constants.h
	+++ b/src/Constants.h
	@@ -1,247 +1,246 @@
	/** This file is part of Witch Blast.
	*
	* FreeTumble is free software: you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation, either version 3 of the License, or
	* (at your option) any later version.
	*
	* FreeTumble is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.
	*
	* You should have received a copy of the GNU General Public License
	* along with FreeTumble. If not, see <http://www.gnu.org/licenses/>.
	*/

	#ifndef CONSTANTS_H_INCLUDED
	#define CONSTANTS_H_INCLUDED

	// uncomment to show bounding box in the app
	// #define SHOW_BOUNDING_BOX

	#include <string>

	const std::string APP_NAME = "Witch Blast";
	const std::string APP_VERSION = "0.0.6";

	// Client size
	const int SCREEN_WIDTH = 970;
	const int SCREEN_HEIGHT = 720;

	// Tile set
	const int TILE_WIDTH = 64;
	const int TILE_HEIGHT = 64;

	// Tile map offset
	const int OFFSET_X = 5;
	const int OFFSET_Y = 5;

	const int MAP_WIDTH = 15;
	const int MAP_HEIGHT = 9;

	const int FLOOR_WIDTH = 13;
	const int FLOOR_HEIGHT = 7;

	const int ITEM_WIDTH = 32;
	const int ITEM_HEIGHT = 32;

	const int BOLT_WIDTH = 24;
	const int BOLT_HEIGHT = 24;

	const int BB_LEFT = 22;
	const int BB_RIGHT = 22;
	const int BB_TOP = 4;
	const int BB_BOTTOM = 31;

	const float FADE_IN_DELAY = 1.0f;
	const float FADE_OUT_DELAY = 1.0f;

	enum item_images {
	IMAGE_PLAYER,
	IMAGE_BOLT,
	IMAGE_TILES,
	IMAGE_RAT,
	IMAGE_MINIMAP,
	IMAGE_DOOR,
	IMAGE_ITEMS,
	IMAGE_ITEMS_EQUIP,
	IMAGE_CHEST,
	IMAGE_BAT,
	IMAGE_FLOWER,
	IMAGE_SLIME,

	IMAGE_KING_RAT,

	IMAGE_BLOOD,
	IMAGE_CORPSES,
	IMAGE_CORPSES_BIG,
	IMAGE_STAR,
	IMAGE_STAR_2,
	IMAGE_INTERFACE,

	IMAGE_PNJ,
	IMAGE_FAIRY
	};

	enum sound_resources {
	SOUND_STEP,
	SOUND_BLAST_STANDARD,
	SOUND_BLAST_FLOWER,
	SOUND_DOOR_CLOSING,
	SOUND_DOOR_OPENING,
	SOUND_CHEST_OPENING,
	SOUND_IMPACT,
	SOUND_BONUS,
	SOUND_DRINK,
	SOUND_PLAYER_HIT,
	SOUND_PLAYER_DIE,
	SOUND_ENNEMY_DYING,
	SOUND_COIN_PICK_UP,
	SOUND_PAY,
	SOUND_WALL_IMPACT,
	SOUND_BIG_WALL_IMPACT,
	SOUND_KING_RAT_1,
	SOUND_KING_RAT_2,
	SOUND_KING_RAT_DIE,
	SOUND_SLIME_JUMP,
	SOUND_SLIME_IMAPCT,
	SOUND_SLIME_IMAPCT_WEAK,
	SOUND_ICE_CHARGE
	};

	enum corpses_ressources{
	FRAME_CORPSE_RAT,
	FRAME_CORPSE_BAT,
	FRAME_CORPSE_FLOWER,
	FRAME_CORPSE_GREEN_RAT,
	FRAME_CORPSE_SLIME,

	FRAME_CORPSE_KING_RAT
	};

	// Player game play
	const float INITIAL_PLAYER_SPEED = 180.0f;
	const int INITIAL_PLAYER_HP = 20;
	const float INITIAL_PLAYER_FIRE_DELAY = 0.7f;
	const float ACQUIRE_DELAY = 2.8f;
	const float UNLOCK_DELAY = 1.0f;

	const float INITIAL_BOLT_LIFE = 0.4f;
	const int INITIAL_BOLT_DAMAGES = 8;
	const float INITIAL_BOLT_VELOCITY = 700.0f;

	const float FAIRY_SPEED = 180.0f; //400.0f;
	const float FAIRY_FIRE_DELAY = 0.8f;
	const float FAIRY_BOLT_LIFE = 0.4f;
	const int FAIRY_BOLT_DAMAGES = 8;
	const float FAIRY_BOLT_VELOCITY = 700.0f;

	enum chest_type_enum {
	CHEST_BASIC,
	CHEST_FAIRY
	};
	// Artefact Info
	const float ARTEFACT_RECT_WIDTH = 600.0f;
	const float ARTEFACT_RECT_HEIGHT = 100.0f;
	const float ARTEFACT_POS_Y = 450.0f;
	const float ARTEFACT_BORDER = 8.0f;
	const float ARTEFACT_ZOOM_TIME = 0.5f;

	-// bolts
	-enum enumBoltType
	-{
	- BoltStandard,
	- BoltIce
	-};
	+// shot types
	+enum enumShotType {
	+ ShotTypeStandard,
	+ ShotTypeIce
	+ };

	// status
	const float STATUS_FROZEN_DELAY = 5.0f; // how long the freeze occurs
	const float STATUS_FROZEN_BOLT_DELAY = 2.5f; // how long the freeze occurs
	const float STATUS_FROZEN_MULT = 0.33f; // speed multiplier (= 3 times slower)

	// entity type
	const int ENTITY_PLAYER = 1;
	const int ENTITY_FAMILIAR = 2;
	const int ENTITY_DOOR = 3;
	const int ENTITY_ARTIFACT_DESCRIPTION = 9;
	const int ENTITY_BLOOD = 11;
	const int ENTITY_CORPSE = 12;
	const int ENTITY_EFFECT = 13;
	const int ENTITY_BOLT = 15;
	const int ENTITY_ENNEMY_BOLT = 16;
	const int ENTITY_PNJ = 17;
	const int ENTITY_CHEST = 18;
	const int ENTITY_ITEM = 19;
	const int ENTITY_ENNEMY = 21;
	const int ENTITY_ENNEMY_INVOCATED = 22;
	const int ENTITY_ENNEMY_BOSS = 23;

	// monster type
	enum monster_type_enum
	{
	MONSTER_RAT,
	MONSTER_BAT,
	MONSTER_EVIL_FLOWER,
	MONSTER_SLIME,

	MONSTER_KING_RAT
	};

	const float DOOR_OPEN_TIME = 1.0f;
	const float DOOR_CLOSE_TIME = 1.0f;

	// Rat
	const float RAT_SPEED = 160.0f;
	const int RAT_HP = 24;
	const int RAT_DAMAGES = 5;
	const int RAT_BB_LEFT = 14;
	const int RAT_BB_WIDTH_DIFF = 28;
	const int RAT_BB_TOP = 22;
	const int RAT_BB_HEIGHT_DIFF = 22;

	// Green Rat
	const float GREEN_RAT_SPEED = 170.0f;
	const int GREEN_RAT_HP = 16;
	const int GREEN_RAT_DAMAGES = 5;
	const float GREEN_RAT_FADE = 1.0f;

	// Bat
	const float BAT_SPEED = 250.0f;
	const int BAT_HP = 8;
	const int BAT_DAMAGES = 5;
	const int BAT_BB_LEFT = 5;
	const int BAT_BB_WIDTH_DIFF = 10;
	const int BAT_BB_TOP = 2;
	const int BAT_BB_HEIGHT_DIFF = 32;

	// Evl Flower
	const int EVIL_FLOWER_HP = 16;
	const int EVIL_FLOWER_MELEE_DAMAGES = 8;
	const int EVIL_FLOWER_MISSILE_DAMAGES = 5;
	const int EVIL_FLOWER_BB_LEFT = 14;
	const int EVIL_FLOWER_BB_WIDTH_DIFF = 28;
	const int EVIL_FLOWER_BB_TOP = 22;
	const int EVIL_FLOWER_BB_HEIGHT_DIFF = 22;
	const float EVIL_FLOWER_FIRE_DELAY = 2.7f;
	const float EVIL_FLOWER_FIRE_VELOCITY = 220.0f;

	// Slime
	const int SLIME_HP = 16;
	const int SLIME_DAMAGES = 5;
	const int SLIME_BB_LEFT = 13;
	const int SLIME_BB_WIDTH_DIFF = 26;
	const int SLIME_BB_TOP = 38;
	const int SLIME_BB_HEIGHT_DIFF = 40;

	// KingRat
	const float KING_RAT_SPEED = 200.0f;
	const float KING_RAT_RUNNING_SPEED = 600.0f;
	const float KING_RAT_BERSERK_SPEED = 250.0f;
	const int KING_RAT_HP = 600;
	const int KING_RAT_DAMAGES = 8;

	// EFFECTS
	const float HURTING_DELAY = 0.4f;

	#endif // CONSTANTS_H_INCLUDED
	diff --git a/src/EnnemyEntity.cpp b/src/EnnemyEntity.cpp
	index b46d611..9aa2a55 100644
	--- a/src/EnnemyEntity.cpp
	+++ b/src/EnnemyEntity.cpp
	@@ -1,124 +1,124 @@
	#include "EnnemyEntity.h"
	#include "BoltEntity.h"
	#include "PlayerEntity.h"
	#include "sfml_game/SpriteEntity.h"
	#include "sfml_game/ImageManager.h"
	#include "sfml_game/SoundManager.h"
	#include "Constants.h"
	#include <iostream>
	#include "WitchBlastGame.h"

	EnnemyEntity::EnnemyEntity(sf::Texture* image, float x, float y)
	: BaseCreatureEntity (image, x, y, 64, 64)
	{
	type = ENTITY_ENNEMY;
	bloodColor = bloodRed;

	z = y;
	age = -0.001f * (rand()%800) - 0.4f;
	}

	void EnnemyEntity::animate(float delay)
	{
	if (canCollide()) testSpriteCollisions();
	if (age > 0.0f)
	BaseCreatureEntity::animate(delay);
	else
	age += delay;
	}

	void EnnemyEntity::calculateBB()
	{
	boundingBox.left = (int)x - width / 2;
	boundingBox.width = width;
	boundingBox.top = (int)y - height / 2;
	boundingBox.height = height;
	}

	void EnnemyEntity::collideMapRight()
	{
	velocity.x = 0.0f;
	}

	void EnnemyEntity::collideMapLeft()
	{
	velocity.x = 0.0f;
	}

	void EnnemyEntity::collideMapTop()
	{
	velocity.y = 0.0f;
	}

	void EnnemyEntity::collideMapBottom()
	{
	velocity.y = 0.0f;
	}

	void EnnemyEntity::readCollidingEntity(CollidingSpriteEntity* entity)
	{
	if (collideWithEntity(entity) &&
	(entity->getType() == ENTITY_PLAYER \|\| entity->getType() == ENTITY_BOLT ))
	{
	PlayerEntity* playerEntity = dynamic_cast<PlayerEntity*>(entity);
	BoltEntity* boltEntity = dynamic_cast<BoltEntity*>(entity);

	if (playerEntity != NULL && !playerEntity->isDead())
	{
	- if (playerEntity->hurt(meleeDamages, BoltStandard))
	+ if (playerEntity->hurt(meleeDamages, ShotTypeStandard))
	{
	float xs = (x + playerEntity->getX()) / 2;
	float ys = (y + playerEntity->getY()) / 2;
	SpriteEntity* star = new SpriteEntity(ImageManager::getImageManager()->getImage(IMAGE_STAR_2), xs, ys);
	star->setFading(true);
	star->setZ(y+ 100);
	star->setLifetime(0.7f);
	star->setType(16);
	star->setSpin(400.0f);
	}
	}

	else if (boltEntity != NULL && !boltEntity->getDying() && boltEntity->getAge() > 0.05f)
	{
	boltEntity->collide();
	hurt(boltEntity->getDamages(), boltEntity->getBoltType());
	game().generateBlood(x, y, bloodColor);
	SoundManager::getSoundManager()->playSound(SOUND_IMPACT);

	float xs = (x + boltEntity->getX()) / 2;
	float ys = (y + boltEntity->getY()) / 2;
	SpriteEntity* star = new SpriteEntity(ImageManager::getImageManager()->getImage(IMAGE_STAR_2), xs, ys);
	star->setFading(true);
	star->setZ(y+ 100);
	star->setLifetime(0.7f);
	star->setType(16);
	star->setSpin(400.0f);
	}
	}
	}

	void EnnemyEntity::dying()
	{
	isDying = true;
	SpriteEntity* deadRat = new SpriteEntity(ImageManager::getImageManager()->getImage(3), x, y, 64, 64);
	//deadRat->setZ(y + height);
	deadRat->setZ(OFFSET_Y);
	deadRat->setFrame(2);
	deadRat->setType(13);
	}

	void EnnemyEntity::drop()
	{
	if (rand() % 5 == 0)
	{
	ItemEntity* newItem = new ItemEntity(ItemCopperCoin, x, y);
	newItem->setMap(map, TILE_WIDTH, TILE_HEIGHT, OFFSET_X, OFFSET_Y);
	newItem->setVelocity(Vector2D(100.0f + rand()% 250));
	newItem->setViscosity(0.96f);
	}
	}

	bool EnnemyEntity::canCollide()
	{
	return true;
	}
	diff --git a/src/FairyEntity.cpp b/src/FairyEntity.cpp
	index 95ca574..6fedfa5 100644
	--- a/src/FairyEntity.cpp
	+++ b/src/FairyEntity.cpp
	@@ -1,79 +1,79 @@
	#include "FairyEntity.h"
	#include "BoltEntity.h"
	#include "Constants.h"
	#include "sfml_game/ImageManager.h"
	#include "sfml_game/SoundManager.h"
	#include <iostream>

	FairyEntity::FairyEntity(float x, float y, PlayerEntity* parentEntity) : SpriteEntity (ImageManager::getImageManager()->getImage(IMAGE_FAIRY), x, y, 48, 72)
	{
	this->x = x;
	this->y = y;

	this->setFrame(0);
	this->parentEntity = parentEntity;

	type = ENTITY_FAMILIAR;
	//viscosity = 0.99f;

	fireDelay = -1.0f;
	}


	void FairyEntity::animate(float delay)
	{
	z = y + height;

	if (fireDelay > 0) fireDelay -= delay;

	frame = ((int)(age * 10.0f)) % 2;

	float dist2 = (x - parentEntity->getX()) * (x - parentEntity->getX()) + (y - parentEntity->getY()) * (y - parentEntity->getY());

	if (dist2 > 15000.0f)
	{
	float tan = (parentEntity->getX() - x) / (parentEntity->getY() - y);
	float angle = atan(tan);

	if (parentEntity->getY() > y)
	setVelocity(Vector2D(sin(angle) * FAIRY_SPEED, cos(angle) * FAIRY_SPEED));
	else
	setVelocity(Vector2D(-sin(angle) * FAIRY_SPEED, -cos(angle) * FAIRY_SPEED));

	viscosity = 1.0f;

	/velocity.x = 2 (parentEntity->getX() - x);
	velocity.y = 2 * (parentEntity->getY() - y);*/
	}
	else if (dist2 < 50000.0f)
	{
	viscosity = 0.96f;
	}

	// x = parentEntity->getX() + 50;
	// y = parentEntity->getY() - 20;

	SpriteEntity::animate(delay);
	}

	void FairyEntity::fire(int dir, GameMap* map)
	{
	if (fireDelay <= 0.0f)
	{
	SoundManager::getSoundManager()->playSound(SOUND_BLAST_STANDARD);
	fireDelay = FAIRY_FIRE_DELAY;

	float velx = 0.0f;
	float vely = 0.0f;

	if (dir == 4) velx = - FAIRY_BOLT_VELOCITY;
	if (dir == 6) velx = + FAIRY_BOLT_VELOCITY;
	if (dir == 2) vely = + FAIRY_BOLT_VELOCITY;
	if (dir == 8) vely = - FAIRY_BOLT_VELOCITY;

	- BoltEntity* bolt = new BoltEntity(ImageManager::getImageManager()->getImage(IMAGE_BOLT), x, y, FAIRY_BOLT_LIFE, BoltStandard);
	+ BoltEntity* bolt = new BoltEntity(ImageManager::getImageManager()->getImage(IMAGE_BOLT), x, y, FAIRY_BOLT_LIFE, ShotTypeStandard);
	bolt->setMap(map, TILE_WIDTH, TILE_HEIGHT, OFFSET_X, OFFSET_Y);
	bolt->setDamages(FAIRY_BOLT_DAMAGES);
	bolt->setVelocity(Vector2D(velx, vely));
	}
	}
	diff --git a/src/Items.h b/src/Items.h
	index 4b4012c..6499c89 100644
	--- a/src/Items.h
	+++ b/src/Items.h
	@@ -1,143 +1,147 @@
	#ifndef ITEMS_H
	#define ITEMS_H

	+#include "Constants.h"
	+
	/** Alignment enum
	* Alignment of the player and equipment.
	*/
	enum enumAlignment
	{
	AlignmentNone, /*< No alignment /
	AlignmentLight, /*< Light (order) /
	AlignmentDark /*< Dark (chaos) /
	};
	+const int SPECIAL_SHOT_SLOTS_STANDARD = 2;
	+const int SPECIAL_SHOT_SLOTS_ADVANCED = 2;
	+const int SPECIAL_SHOT_SLOTS = 1 + SPECIAL_SHOT_SLOTS_STANDARD + SPECIAL_SHOT_SLOTS_ADVANCED;

	/** Item type enum
	* All the items and equipments.
	*/
	enum enumItemType
	{
	ItemCopperCoin,
	ItemSilverCoin,
	ItemGoldCoin,
	itemHealth,

	ItemMagicianHat, // first equip item
	ItemLeatherBoots,
	ItemBookDualShots,
	ItemRageAmulet,
	ItemBossKey,
	ItemVibrationGloves,
	ItemMahoganyStaff,
	ItemFairy,
	ItemLeatherBelt,
	ItemBloodSnake,
	ItemIceGem
	};

	const int FirstEquipItem = (int) ItemMagicianHat; /!< Used as an offset when creating items /

	/*!
	* \brief Item structure
	*
	* Contains all the data for an item.
	*/
	struct itemStuct
	{
	- enumItemType type; /*< The item ID /
	- std::string name; /*< The item name /
	- std::string description; /*< The item description /
	- int price; /*< The item price (for shops) /
	- bool equip; /*< True if the item is an equipment /
	- bool canBeSold; /*< True if the item is can be sold /
	- int level; /*< Minimal level where the item can be found /
	- enumAlignment alignment; /*< Item alignment /
	- int requirement; /*< Pre-requisite item /
	+ enumItemType type; /*< The item ID /
	+ std::string name; /*< The item name /
	+ std::string description; /*< The item description /
	+ int price; /*< The item price (for shops) /
	+ bool equip; /*< True if the item is an equipment /
	+ bool canBeSold; /*< True if the item is can be sold /
	+ int level; /*< Minimal level where the item can be found /
	+ enumAlignment alignment; /*< Item alignment /
	+ int requirement; /*< Pre-requisite item /
	+ enumShotType specialShot; /*< Special shot /
	};

	const int NUMBER_ITEMS = 15; /!< Total number of items /
	-
	/** Array with all the items and data */
	const itemStuct items[NUMBER_ITEMS] =
	{
	{
	ItemCopperCoin, "Copper coin", "A copper coin (value 1)",
	- 1, false, false, 1, AlignmentNone, -1
	+ 1, false, false, 1, AlignmentNone, -1, ShotTypeStandard
	},
	{
	ItemSilverCoin, "Silver coin", "A silver coin (value 5)",
	- 5, false, false, 1, AlignmentNone, -1
	+ 5, false, false, 1, AlignmentNone, -1, ShotTypeStandard
	},
	{
	ItemGoldCoin, "Gold coin", "A gold coin (value 20)",
	- 20, false, false, 1, AlignmentNone, -1
	+ 20, false, false, 1, AlignmentNone, -1, ShotTypeStandard
	},
	{
	itemHealth, "Health potion", "A health potion",
	- 8, false, true, 1, AlignmentNone, -1
	+ 8, false, true, 1, AlignmentNone, -1, ShotTypeStandard
	},
	{
	ItemMagicianHat, "Enchanter Hat", "Increases fire rate",
	- 20, true, true, 1, AlignmentNone, -1
	+ 20, true, true, 1, AlignmentNone, -1, ShotTypeStandard
	},
	{
	ItemLeatherBoots, "Leather Boots", "Increases Boots",
	- 20, true, true, 1, AlignmentNone, -1
	+ 20, true, true, 1, AlignmentNone, -1, ShotTypeStandard
	},
	{
	ItemBookDualShots, "Spell : Dual Bolts", "Shoots two bolts",
	- 20, true, true, 1, AlignmentNone, -1
	+ 20, true, true, 1, AlignmentNone, -1, ShotTypeStandard
	},
	{
	ItemRageAmulet, "Rage Amulet", "Increases fire range",
	- 20, true, true, 1, AlignmentNone, -1
	+ 20, true, true, 1, AlignmentNone, -1, ShotTypeStandard
	},
	{
	ItemBossKey, "Boss Key", "Open the Boss gate",
	- 200, true, false, 1, AlignmentNone, -1
	+ 200, true, false, 1, AlignmentNone, -1, ShotTypeStandard
	},
	{
	ItemVibrationGloves, "Vibration Gloves", "Increases bolt's speed and damages",
	- 20, true, true, 1, AlignmentNone, -1
	+ 20, true, true, 1, AlignmentNone, -1, ShotTypeStandard
	},
	{
	ItemMahoganyStaff, "Mahogany Staff", "Increases bolt's speed and damages",
	- 20, true, true, 1, AlignmentNone, -1
	+ 20, true, true, 1, AlignmentNone, -1, ShotTypeStandard
	},
	{
	ItemFairy, "Fairy", "Help you in the dungeon",
	- 20, true, false, 1, AlignmentNone, -1
	+ 20, true, false, 1, AlignmentNone, -1, ShotTypeStandard
	},
	{
	ItemLeatherBelt, "Leather Belt", "Increases fire rate",
	- 20, true, true, 1, AlignmentNone, -1
	+ 20, true, true, 1, AlignmentNone, -1, ShotTypeStandard
	},
	{
	ItemBloodSnake, "Blood Snake", "Increases damages",
	- 25, true, true, 1, AlignmentNone, -1
	+ 25, true, true, 1, AlignmentNone, -1, ShotTypeStandard
	},
	{
	ItemIceGem, "Ice Gem", "Ice attack",
	- 25, true, true, 1, AlignmentNone, -1
	+ 25, true, true, 1, AlignmentNone, -1, ShotTypeIce
	}
	};

	const int NUMBER_EQUIP_ITEMS = 11; /!< Number of equip items /
	-
	/** Item equipment type enum
	* All the equipments.
	*/
	enum item_equip_enum {
	EQUIP_ENCHANTER_HAT,
	EQUIP_LEATHER_BOOTS,
	EQUIP_BOOK_DUAL,
	EQUIP_CONCENTRATION_AMULET,
	EQUIP_BOSS_KEY,
	EQUIP_VIBRATION_GLOVES,
	EQUIP_MAHOGANY_STAFF,
	EQUIP_FAIRY,
	EQUIP_LEATHER_BELT,
	EQUIP_BLOOD_SNAKE,
	- EQUIP_ICE_GEM
	+ EQUIP_GEM_ICE
	};

	#endif
	diff --git a/src/PlayerEntity.cpp b/src/PlayerEntity.cpp
	index 0e9074c..81d2525 100644
	--- a/src/PlayerEntity.cpp
	+++ b/src/PlayerEntity.cpp
	@@ -1,688 +1,762 @@
	#include "PlayerEntity.h"
	#include "BoltEntity.h"
	#include "EnnemyBoltEntity.h"
	#include "ItemEntity.h"
	#include "FairyEntity.h"
	#include "sfml_game/ImageManager.h"
	#include "sfml_game/SoundManager.h"
	#include "Constants.h"
	#include "WitchBlastGame.h"

	#include <iostream>

	PlayerEntity::PlayerEntity(float x = 0.0f, float y = 0.0f)
	: BaseCreatureEntity (ImageManager::getImageManager()->getImage(IMAGE_PLAYER), x, y, 64, 96)
	{
	currentFireDelay = -1.0f;
	canFirePlayer = true;
	type = ENTITY_PLAYER;

	imagesProLine = 8;
	playerStatus = playerStatusPlaying;
	hp = INITIAL_PLAYER_HP;
	hpDisplay = hp;
	hpMax = INITIAL_PLAYER_HP;
	gold = 0;

	boltLifeTime = INITIAL_BOLT_LIFE;
	specialBoltTimer = -1.0f;
	bloodColor = bloodRed;

	+ // init the equipment (to empty)
	for (int i = 0; i < NUMBER_EQUIP_ITEMS; i++) equip[i] = false;
	collidingDirection = 0;

	+ // init the shots (to none)
	+ for (int i = 0; i < SPECIAL_SHOT_SLOTS; i++) specialShots[i] = ShotTypeStandard;
	+ specialShotIndex = 0;
	+
	computePlayer();

	firingDirection = 5;
	facingDirection = 2;
	}

	void PlayerEntity::moveTo(float newX, float newY)
	{
	float dx = newX - x;
	float dy = newY - y;

	x = newX;
	y = newY;

	if (equip[EQUIP_FAIRY])
	{
	fairy->setX(fairy->getX() + dx);
	fairy->setY(fairy->getY() + dy);
	}
	}

	int PlayerEntity::getFacingDirection()
	{
	return facingDirection;
	}

	float PlayerEntity::getPercentFireDelay()
	{
	if (canFirePlayer) return 1.0f;

	else return (1.0f - currentFireDelay / fireDelay);
	}

	int PlayerEntity::getCollidingDirection()
	{
	return collidingDirection;
	}

	bool PlayerEntity::isDead()
	{
	return playerStatus==playerStatusDead;
	}

	void PlayerEntity::setEntering()
	{
	playerStatus = playerStatusEntering;
	}

	void PlayerEntity::pay(int price)
	{
	gold -= price;
	if (gold < 0) gold = 0;
	SoundManager::getSoundManager()->playSound(SOUND_PAY);
	}

	void PlayerEntity::animate(float delay)
	{
	if (specialBoltTimer >= 0.0f)
	{
	specialBoltTimer -= delay;
	if (specialBoltTimer <= 0.0f)
	{
	- if (equip[EQUIP_ICE_GEM]) SoundManager::getSoundManager()->playSound(SOUND_ICE_CHARGE);
	+ if (getShotType() == ShotTypeIce) SoundManager::getSoundManager()->playSound(SOUND_ICE_CHARGE);
	}
	}
	// rate of fire
	if (!canFirePlayer)
	{
	currentFireDelay -= delay;
	canFirePlayer = (currentFireDelay <= 0.0f);
	}
	// acquisition animation
	if (playerStatus == playerStatusAcquire)
	{
	acquireDelay -= delay;
	if (acquireDelay <= 0.0f)
	{
	equip[acquiredItem] = true;
	computePlayer();
	playerStatus = playerStatusPlaying;

	+ int itemID = acquiredItem + FirstEquipItem;
	+
	if (acquiredItem == (int)EQUIP_FAIRY)
	- {
	fairy = new FairyEntity(x, y - 50.0f, this);
	- }
	+
	+ if (items[itemID].specialShot != (ShotTypeStandard))
	+ registerSpecialShot(itemID);
	}
	}
	// unlocking animation
	else if (playerStatus == playerStatusUnlocking)
	{
	acquireDelay -= delay;
	if (acquireDelay <= 0.0f)
	{
	playerStatus = playerStatusPlaying;
	}
	}
	//z = y;
	if (playerStatus != playerStatusDead) testSpriteCollisions();
	collidingDirection = 0;
	BaseCreatureEntity::animate(delay);

	if (firingDirection != 5)
	facingDirection = firingDirection;
	firingDirection = 5;

	if (isMoving())
	{
	frame = ((int)(age * 5.0f)) % 4;
	if (frame == 3) frame = 2;
	else if (frame == 2) frame = 0;
	SoundManager::getSoundManager()->playSound(SOUND_STEP);
	}
	else if (playerStatus == playerStatusAcquire \|\| playerStatus == playerStatusUnlocking)
	frame = 3;
	else if (playerStatus == playerStatusDead)
	frame = 0;
	else
	frame = 0; //1;

	if (x < OFFSET_X)
	game().moveToOtherMap(4);
	else if (x > OFFSET_X + MAP_WIDTH * TILE_WIDTH)
	game().moveToOtherMap(6);
	else if (y < OFFSET_Y)
	game().moveToOtherMap(8);
	else if (y > OFFSET_Y + MAP_HEIGHT * TILE_HEIGHT - 5)
	game().moveToOtherMap(2);

	if (playerStatus == playerStatusEntering)
	{
	if (boundingBox.left > OFFSET_X + TILE_WIDTH
	&& (boundingBox.left + boundingBox.width) < OFFSET_X + TILE_WIDTH * (MAP_WIDTH - 1)
	&& boundingBox.top > OFFSET_Y + TILE_HEIGHT
	&& (boundingBox.top + boundingBox.height) < OFFSET_Y + TILE_HEIGHT * (MAP_HEIGHT - 1))
	{
	playerStatus = playerStatusPlaying;
	game().closeDoors();
	}
	}

	if (playerStatus == playerStatusDead)
	{
	z = OFFSET_Y - 2;
	}
	}

	+void PlayerEntity::renderHead(sf::RenderWindow* app)
	+{
	+
	+}
	+
	+void PlayerEntity::renderBody(sf::RenderWindow* app)
	+{
	+
	+}
	+
	+void PlayerEntity::renderArms(sf::RenderWindow* app)
	+{
	+
	+}
	+
	+void PlayerEntity::renderFeet(sf::RenderWindow* app)
	+{
	+
	+}
	+
	+void PlayerEntity::renderStaff(sf::RenderWindow* app)
	+{
	+
	+}
	+

	void PlayerEntity::render(sf::RenderWindow* app)
	{

	sprite.setPosition(x, y);

	/*
	int spriteDx = 0;
	if (facingDirection == 8) spriteDx = 3;
	if (facingDirection == 4) spriteDx = 6;
	if (facingDirection == 6) spriteDx = 9;

	// body
	sprite.setTextureRect(sf::IntRect( (frame + spriteDx) * width, height, width, height));
	app->draw(sprite);

	// head
	sprite.setTextureRect(sf::IntRect( (frame + spriteDx) * width, 0, width, height));
	app->draw(sprite);

	// feet
	sprite.setTextureRect(sf::IntRect( (frame + spriteDx) * width, height * 2, width, height));
	app->draw(sprite);

	// staff
	sprite.setTextureRect(sf::IntRect( (frame + spriteDx) * width, height * 4, width, height));
	app->draw(sprite);

	// hands
	sprite.setTextureRect(sf::IntRect( (frame + spriteDx) * width, height * 3, width, height));
	app->draw(sprite);
	*/

	if (playerStatus == playerStatusDead)
	{
	// blood
	sprite.setTextureRect(sf::IntRect(6 * width, 0, width, height));
	app->draw(sprite);

	// body
	sprite.setTextureRect(sf::IntRect(3 * width, height, width, height));
	app->draw(sprite);

	// feet
	sprite.setTextureRect(sf::IntRect(3 * width, 2 * height, width, height));
	app->draw(sprite);

	// hand
	sprite.setTextureRect(sf::IntRect(3 * width, 3 * height, width, height));
	app->draw(sprite);
	}
	else
	{
	// shadow
	sprite.setTextureRect(sf::IntRect(7 * width, 0, width, height));
	app->draw(sprite);

	// body
	sprite.setTextureRect(sf::IntRect(frame * width, height, width, height));
	app->draw(sprite);

	// belt
	if (equip[EQUIP_LEATHER_BELT])
	{
	sprite.setTextureRect(sf::IntRect(frame * width, 6 *height, width, height));
	app->draw(sprite);
	}

	// head
	if (playerStatus != playerStatusAcquire && playerStatus != playerStatusUnlocking)
	{
	sprite.setTextureRect(sf::IntRect(0, 0, width, height));
	app->draw(sprite);

	// hat
	if (equip[EQUIP_ENCHANTER_HAT])
	{
	sprite.setTextureRect(sf::IntRect(3 * width, 0, width, height));
	app->draw(sprite);
	}
	}
	// feet
	if( equip[EQUIP_LEATHER_BOOTS])
	sprite.setTextureRect(sf::IntRect((frame + 4) * width, 2 * height, width, height));
	else
	sprite.setTextureRect(sf::IntRect(frame * width, 2 * height, width, height));
	app->draw(sprite);

	// staff
	if ( equip[EQUIP_MAHOGANY_STAFF])
	sprite.setTextureRect(sf::IntRect((frame + 4) * width + 4, 4 * height, width, height));
	else
	sprite.setTextureRect(sf::IntRect(frame * width + 4, 4 * height, width, height));
	app->draw(sprite);

	// snake
	if (equip[EQUIP_BLOOD_SNAKE])
	{
	sprite.setTextureRect(sf::IntRect(frame * width + 4, 7 *height, width, height));
	app->draw(sprite);
	}

	// ice gem
	- if (equip[EQUIP_ICE_GEM])
	+ if (getShotType() == ShotTypeIce)
	{
	sprite.setTextureRect(sf::IntRect(frame * width + 4, 8 *height, width, height));
	app->draw(sprite);

	int fade;
	if (specialBoltTimer <= 0.0f) fade = 255;
	else fade = ((STATUS_FROZEN_BOLT_DELAY - specialBoltTimer) / STATUS_FROZEN_BOLT_DELAY) * 128;

	sprite.setTextureRect(sf::IntRect(256, 0, 20, 20));
	sprite.setColor(sf::Color(255, 255, 255, fade));

	if (frame == 1)
	sprite.setPosition(x + 5, y + 3);
	else if (frame == 2)
	sprite.setPosition(x + 16, y + 3);
	else
	sprite.setPosition(x + 3, y + 1);

	sf::RenderStates r;
	r.blendMode = sf::BlendAdd;
	app->draw(sprite, r);

	sprite.setPosition(x, y);
	sprite.setColor(sf::Color(255, 255, 255, 255));
	}

	// hands
	if( equip[EQUIP_VIBRATION_GLOVES])
	sprite.setTextureRect(sf::IntRect((frame + 4) * width, 3 * height, width, height));
	else
	sprite.setTextureRect(sf::IntRect(frame * width, 3 * height, width, height));
	app->draw(sprite);

	// head
	if (playerStatus == playerStatusAcquire \|\| playerStatus == playerStatusUnlocking)
	{
	sprite.setTextureRect(sf::IntRect(width, 0, width, height));
	app->draw(sprite);

	// hat
	if (equip[EQUIP_ENCHANTER_HAT])
	{
	sprite.setTextureRect(sf::IntRect(3 * width, 0, width, height));
	app->draw(sprite);
	}

	// staff
	if ( equip[EQUIP_MAHOGANY_STAFF])
	sprite.setTextureRect(sf::IntRect(5 * width + 4, 4 * height, width, height));
	else
	sprite.setTextureRect(sf::IntRect(width + 4, 4 * height, width, height));
	app->draw(sprite);

	// snake
	if (equip[EQUIP_BLOOD_SNAKE])
	{
	sprite.setTextureRect(sf::IntRect(1 * width + 4, 7 *height, width, height));
	app->draw(sprite);
	}

	// ice gem
	- if (equip[EQUIP_ICE_GEM])
	+ if (getShotType() == ShotTypeIce)
	{
	sprite.setTextureRect(sf::IntRect(1 * width + 4, 8 *height, width, height));
	app->draw(sprite);
	}
	}

	// necklace
	if (equip[EQUIP_CONCENTRATION_AMULET])
	{
	sprite.setTextureRect(sf::IntRect(frame * width, 5 * height, width, height));
	app->draw(sprite);

	sprite.setColor(sf::Color(255,255,255, (1.0f + sin(age * 5.0f)) * 100));
	sprite.setTextureRect(sf::IntRect(5 * width, 0, width, height));
	app->draw(sprite);
	sprite.setColor(sf::Color(255,255,255,255));
	}
	}
	}


	void PlayerEntity::calculateBB()
	{
	boundingBox.left = (int)x - width / 2;
	boundingBox.width = width;
	boundingBox.top = (int)y - height / 2;
	boundingBox.height = height;

	float fPrez = 10.0f;
	boundingBox.left += fPrez;
	boundingBox.width -= (fPrez + fPrez);
	boundingBox.top += 52.0f;
	boundingBox.height = boundingBox.width - 10.0f;
	}

	void PlayerEntity::readCollidingEntity(CollidingSpriteEntity* entity)
	{

	EnnemyBoltEntity* boltEntity = dynamic_cast<EnnemyBoltEntity*>(entity);

	if (collideWithEntity(entity))
	{
	if (boltEntity != NULL && !boltEntity->getDying())
	{
	boltEntity->collide();
	- hurt(boltEntity->getDamages(), BoltStandard);
	+ hurt(boltEntity->getDamages(), ShotTypeStandard);
	game().generateBlood(x, y, bloodColor);
	}
	}
	}

	void PlayerEntity::move(int direction)
	{
	if (playerStatus == playerStatusPlaying)
	{
	float speedx = 0.0f, speedy = 0.0f;
	if (direction == 1 \|\| direction == 4 \|\| direction == 7)
	speedx = - creatureSpeed;
	else if (direction == 3 \|\| direction == 6 \|\| direction == 9)
	speedx = creatureSpeed;
	if (direction == 1 \|\| direction == 2 \|\| direction == 3)
	speedy = creatureSpeed;
	else if (direction == 7 \|\| direction == 8 \|\| direction == 9)
	speedy = - creatureSpeed;
	setVelocity(Vector2D(speedx, speedy));

	//if (firingDirection != 5)
	// facingDirection = firingDirection;
	//else
	{
	switch (direction)
	{
	case 8: facingDirection = 8; break;
	case 2: facingDirection = 2; break;
	case 4: facingDirection = 4; break;
	case 6: facingDirection = 6; break;
	case 7: if (facingDirection != 4 && facingDirection != 8) facingDirection = 4; break;
	case 1: if (facingDirection != 4 && facingDirection != 2) facingDirection = 4; break;
	case 9: if (facingDirection != 6 && facingDirection != 8) facingDirection = 6; break;
	case 3: if (facingDirection != 6 && facingDirection != 2) facingDirection = 6; break;
	}
	}

	//firingDirection = 5;
	}
	}

	bool PlayerEntity::isMoving()
	{
	if (velocity.x < -1.0f \|\| velocity.x > 1.0f) return true;
	if (velocity.y < -1.0f \|\| velocity.y > 1.0f) return true;
	return false;
	}

	bool PlayerEntity::isEquiped(int eq)
	{
	return equip[eq];
	}

	void PlayerEntity::setEquiped(int item, bool eq)
	{
	equip[item] = eq;
	if (eq && item == (int)EQUIP_FAIRY)
	{
	fairy = new FairyEntity(x, y - 50.0f, this);
	}
	computePlayer();
	}

	void PlayerEntity::generateBolt(float velx, float vely)
	{
	- if (equip[EQUIP_ICE_GEM] && specialBoltTimer <= 0.0f)
	+ enumShotType boltType;
	+ if (getShotType() == ShotTypeIce && specialBoltTimer <= 0.0f)
	{
	- boltType = BoltIce;
	+ boltType = ShotTypeIce;
	specialBoltTimer = STATUS_FROZEN_BOLT_DELAY;
	}
	else
	- boltType = BoltStandard;
	+ boltType = ShotTypeStandard;
	BoltEntity* bolt = new BoltEntity(ImageManager::getImageManager()->getImage(1), x, y + 20, boltLifeTime, boltType);
	bolt->setMap(map, TILE_WIDTH, TILE_HEIGHT, OFFSET_X, OFFSET_Y);
	bolt->setDamages(fireDamages);
	bolt->setVelocity(Vector2D(velx, vely));
	}

	void PlayerEntity::fire(int direction)
	{
	firingDirection = direction;
	if (equip[EQUIP_FAIRY] && playerStatus != playerStatusDead)
	fairy->fire(direction, map);

	if (canFirePlayer && playerStatus != playerStatusDead)
	{
	SoundManager::getSoundManager()->playSound(SOUND_BLAST_STANDARD);

	if (equip[EQUIP_BOOK_DUAL])
	{
	float shoot_angle = 0.2f;

	if ((direction == 4 && velocity.x < -1.0f) \|\| (direction == 6 && velocity.x > 1.0f)
	\|\| (direction == 8 && velocity.y < -1.0f) \|\| (direction == 2 && velocity.y > 1.0f))
	shoot_angle = 0.1f;
	else if ((direction == 6 && velocity.x < -1.0f) \|\| (direction == 4 && velocity.x > 1.0f)
	\|\| (direction == 2 && velocity.y < -1.0f) \|\| (direction == 8 && velocity.y > 1.0f))
	shoot_angle = 0.35f;

	if (equip[EQUIP_VIBRATION_GLOVES]) shoot_angle += (1000 - rand() % 2000) * 0.0001f;

	switch(direction)
	{
	case 4: generateBolt(-fireVelocity * cos(shoot_angle), fireVelocity * sin(shoot_angle));
	generateBolt(-fireVelocity * cos(shoot_angle), - fireVelocity * sin(shoot_angle));break;
	case 6: generateBolt(fireVelocity * cos(shoot_angle), fireVelocity * sin(shoot_angle));
	generateBolt(fireVelocity * cos(shoot_angle), - fireVelocity * sin(shoot_angle));break;
	case 8: generateBolt(fireVelocity * sin(shoot_angle), -fireVelocity * cos(shoot_angle));
	generateBolt(-fireVelocity * sin(shoot_angle), - fireVelocity * cos(shoot_angle));break;
	case 2: generateBolt(fireVelocity * sin(shoot_angle), fireVelocity * cos(shoot_angle));
	generateBolt(-fireVelocity * sin(shoot_angle), fireVelocity * cos(shoot_angle));break;
	}
	}
	else
	{
	if (equip[EQUIP_VIBRATION_GLOVES])
	{
	float shoot_angle = (1000 - rand() % 2000) * 0.0001f;
	switch(direction)
	{
	case 4: generateBolt(-fireVelocity * cos(shoot_angle), fireVelocity * sin(shoot_angle)); break;
	case 6: generateBolt(fireVelocity * cos(shoot_angle), fireVelocity * sin(shoot_angle)); break;
	case 8: generateBolt(fireVelocity * sin(shoot_angle), -fireVelocity * cos(shoot_angle)); break;
	case 2: generateBolt(fireVelocity * sin(shoot_angle), fireVelocity * cos(shoot_angle)); break;
	}
	}
	else
	{
	switch(direction)
	{
	case 4: generateBolt(-fireVelocity, 0.0f); break;
	case 6: generateBolt(fireVelocity, 0.0f); break;
	case 8: generateBolt(0.0f, -fireVelocity); break;
	case 2: generateBolt(0.0f, fireVelocity); break;
	}
	}
	}

	canFirePlayer = false;
	currentFireDelay = fireDelay;
	}
	}

	bool PlayerEntity::canMove()
	{
	return (playerStatus == playerStatusPlaying);
	}

	-bool PlayerEntity::hurt(int damages, enumBoltType hurtingType)
	+bool PlayerEntity::hurt(int damages, enumShotType hurtingType)
	{
	if (!hurting)
	{
	SoundManager::getSoundManager()->playSound(SOUND_PLAYER_HIT);
	- BaseCreatureEntity::hurt(damages, BoltStandard);
	+ BaseCreatureEntity::hurt(damages, ShotTypeStandard);
	game().generateBlood(x, y, bloodColor);
	game().generateBlood(x, y, bloodColor);
	return true;
	}
	return false;
	}

	void PlayerEntity::loseItem(enumItemType itemType, bool isEquip)
	{
	CollidingSpriteEntity* itemSprite
	= new CollidingSpriteEntity(ImageManager::getImageManager()->getImage(isEquip ? IMAGE_ITEMS_EQUIP : IMAGE_ITEMS), x, y, 32, 32);
	itemSprite->setMap(map, TILE_WIDTH, TILE_HEIGHT, OFFSET_X, OFFSET_Y);
	itemSprite->setZ(OFFSET_Y - 1);
	itemSprite->setFrame(itemType);
	itemSprite->setImagesProLine(10);
	itemSprite->setType(ENTITY_BLOOD);
	itemSprite->setVelocity(Vector2D(rand()%450));
	itemSprite->setViscosity(0.95f);
	itemSprite->setSpin( (rand() % 700) - 350.0f);
	}

	void PlayerEntity::dying()
	{
	playerStatus = playerStatusDead;
	hp = 0;
	SoundManager::getSoundManager()->playSound(SOUND_PLAYER_DIE);
	setVelocity(Vector2D(0.0f, 0.0f));

	int i;
	for (i = 0; i < gold; i++) loseItem(ItemCopperCoin, false);

	for (i = 0; i < NUMBER_EQUIP_ITEMS; i++)
	if (equip[i]) loseItem(enumItemType(i), true);

	for (i = 0; i < 8; i++) game().generateBlood(x, y, bloodColor);

	CollidingSpriteEntity* itemSprite
	= new CollidingSpriteEntity(ImageManager::getImageManager()->getImage(IMAGE_PLAYER), x, y, 64, 64);
	itemSprite->setMap(map, TILE_WIDTH, TILE_HEIGHT, OFFSET_X, OFFSET_Y);
	itemSprite->setZ(OFFSET_Y - 1);
	itemSprite->setImagesProLine(10);
	itemSprite->setFrame(/11/1);
	itemSprite->setType(ENTITY_BLOOD);
	itemSprite->setVelocity(Vector2D(rand()%450));
	itemSprite->setViscosity(0.95f);
	itemSprite->setSpin( (rand() % 700) - 350.0f);
	}

	void PlayerEntity::acquireItem(enumItemType type)
	{
	if (type >= FirstEquipItem) acquireStance(type);
	else switch (type)
	{
	case ItemCopperCoin: gold++;
	SoundManager::getSoundManager()->playSound(SOUND_COIN_PICK_UP);
	break;
	case ItemSilverCoin: gold = gold + 5; break;
	case ItemGoldCoin: gold = gold + 10; break;
	case itemHealth: hp += 15;
	SoundManager::getSoundManager()->playSound(SOUND_DRINK);
	if (hp > hpMax) hp = hpMax; break;
	default: break;
	}
	}

	void PlayerEntity::computePlayer()
	{
	float boltLifeTimeBonus = 1.0f;
	float fireDelayBonus = 1.0f;
	float creatureSpeedBonus = 1.0f;
	float fireVelocityBonus = 1.0f;
	float fireDamagesBonus = 1.0f;
	- boltType = BoltStandard;

	if (equip[EQUIP_VIBRATION_GLOVES]) fireDelayBonus -= 0.10f;
	if (equip[EQUIP_ENCHANTER_HAT]) fireDelayBonus -= 0.2f;
	if (equip[EQUIP_LEATHER_BELT]) fireDelayBonus -= 0.15f;
	if (equip[EQUIP_LEATHER_BOOTS]) creatureSpeedBonus += 0.25f;
	if (equip[EQUIP_BOOK_DUAL]) fireDelayBonus += 0.6f;
	if (equip[EQUIP_CONCENTRATION_AMULET]) boltLifeTimeBonus += 0.5f;
	if (equip[EQUIP_MAHOGANY_STAFF])
	{
	fireVelocityBonus += 0.15f;
	fireDamagesBonus += 0.5f;
	}
	if (equip[EQUIP_BLOOD_SNAKE]) fireDamagesBonus += 1.0f;
	- if (equip[EQUIP_ICE_GEM]) boltType = BoltIce;
	+ //if (getShotType()) boltType = BoltIce;

	fireDelay = INITIAL_PLAYER_FIRE_DELAY * fireDelayBonus;
	creatureSpeed = INITIAL_PLAYER_SPEED * creatureSpeedBonus;
	fireVelocity = INITIAL_BOLT_VELOCITY * fireVelocityBonus;
	fireDamages = INITIAL_BOLT_DAMAGES * fireDamagesBonus;
	boltLifeTime = INITIAL_BOLT_LIFE * boltLifeTimeBonus;
	}

	void PlayerEntity::acquireStance(enumItemType type)
	{
	velocity.x = 0.0f;
	velocity.y = 0.0f;
	playerStatus = playerStatusAcquire;
	acquireDelay = ACQUIRE_DELAY;
	acquiredItem = (enumItemType)(type - FirstEquipItem);
	SoundManager::getSoundManager()->playSound(SOUND_BONUS);
	}

	void PlayerEntity::collideMapRight()
	{
	collidingDirection = 6;
	}

	void PlayerEntity::collideMapLeft()
	{
	collidingDirection = 4;
	}

	void PlayerEntity::collideMapTop()
	{
	collidingDirection = 8;
	}

	void PlayerEntity::collideMapBottom()
	{
	collidingDirection = 2;
	}

	void PlayerEntity::useBossKey()
	{
	velocity.x = 0.0f;
	velocity.y = 0.0f;
	playerStatus = playerStatusUnlocking;
	acquireDelay = UNLOCK_DELAY;
	acquiredItem = (enumItemType)(type - FirstEquipItem);
	SoundManager::getSoundManager()->playSound(SOUND_BONUS);
	equip[EQUIP_BOSS_KEY] = false;


	SpriteEntity* spriteItem = new SpriteEntity(
	ImageManager::getImageManager()->getImage(IMAGE_ITEMS_EQUIP),
	x, y - 60.0f, ITEM_WIDTH, ITEM_HEIGHT);
	- spriteItem->setFrame(EQUIP_BOSS_KEY);
	- spriteItem->setZ(z);
	- spriteItem->setLifetime(UNLOCK_DELAY);
	+ spriteItem->setFrame(EQUIP_BOSS_KEY);
	+ spriteItem->setZ(z);
	+ spriteItem->setLifetime(UNLOCK_DELAY);
	+}
	+
	+enumShotType PlayerEntity::getShotType()
	+{
	+ return specialShots[specialShotIndex];
	+}
	+
	+int PlayerEntity::getShotIndex()
	+{
	+ return specialShotIndex;
	+}
	+
	+void PlayerEntity::setShotIndex(int index)
	+{
	+ specialShotIndex = index;
	+}
	+
	+enumShotType PlayerEntity::getShotType(int slot)
	+{
	+ return specialShots[slot];
	+}
	+
	+void PlayerEntity::setShotType(int slot, enumShotType shotType)
	+{
	+ specialShots[slot] = shotType;
	+}
	+
	+void PlayerEntity::registerSpecialShot(int item)
	+{
	+ bool found = false;
	+ int index = 1;
	+ while (index < SPECIAL_SHOT_SLOTS && !found)
	+ {
	+ found = specialShots[index] == ShotTypeStandard;
	+ if (!found) index++;
	+ }
	+ if (found)
	+ {
	+ this->specialShots[index] = items[item].specialShot;
	+ specialShotIndex = index;
	+ }
	}
	diff --git a/src/PlayerEntity.h b/src/PlayerEntity.h
	index 9c22a85..d264b9d 100644
	--- a/src/PlayerEntity.h
	+++ b/src/PlayerEntity.h
	@@ -1,300 +1,364 @@
	#ifndef PLAYERSPRITE_H
	#define PLAYERSPRITE_H

	#include "BaseCreatureEntity.h"
	#include "ItemEntity.h"
	#include "Constants.h"

	class FairyEntity;

	/*! \class PlayerEntity
	* \brief Class for the player
	*
	* It contains the game logic of the player and the rendering.
	*/
	class PlayerEntity : public BaseCreatureEntity
	{
	public:
	/*!
	* \brief Constructor
	*
	* Constructor of the PlayerEntity class.
	*
	* \param x : x position of the player
	* \param y : y position of the player
	*/
	PlayerEntity(float x, float y);

	/*!
	* \brief updates the player
	*
	* Updates the player.
	* Called in the game loop.
	*
	* \param delay : elapsed time since the last call
	*/
	virtual void animate(float delay);

	/*!
	* \brief render the player
	*
	* Render the player.
	* Called in the game loop.
	*
	* \param app : Rendering target
	*/
	virtual void render(sf::RenderWindow* app);

	/*!
	* \brief Moves the player to another place
	*
	* Moves the player to another place.
	* Called when changing room, the "familiers" will move too.
	*
	* \param newX : target x position of the player
	* \param newY : target y position of the player
	*/
	void moveTo(float newX, float newY);

	/*!
	* \brief returns the direction the player is facing
	*
	* Return the direction the player is facing.
	* Use to know in which direction he has to fire with the "one button" gameplay.
	*
	* \return : the facing direction. 4 = left, 8 = north, 6 = right, 2 = south
	*/
	int getFacingDirection();

	/*!
	* \brief update the bounding box
	*
	* Update the bounding box of the player.
	* Used before testing collision.
	*/
	virtual void calculateBB();

	/*!
	* \brief Moves the player in the given direction
	*
	* Moves the player in the given direction.
	*
	* \param direction : direction of the new map. Numeric pad, diagonals included : 4 = left, 8 = north, 7 = north-west...
	*/
	void move(int direction);

	/*!
	* \brief Fires in the given direction
	*
	* Fires the player in the given direction.
	*
	* \param direction : direction of the new map. 4 = left, 8 = north, 6 = right, 2 = south
	*/
	void fire(int direction);

	/*!
	* \brief returns if the player is moving or not
	*
	* Returns if the player is moving or not.
	*
	* \return : True if the player is moving
	*/
	bool isMoving();

	/*!
	* \brief returns if an item is equipped or not
	*
	* Returns if an item is equipped or not.
	*
	* \param eq : the equip item ID
	* \return : True if the item is in possession of the player
	*/
	bool isEquiped(int eq);

	/*!
	* \brief updates the equipment of the player
	*
	* Updates the equipment of the player.
	*
	* \param item : the equip item ID
	* \param eq : True if the item has to be equipped
	*/
	void setEquiped(int item, bool eq);

	/*!
	* \brief updates the entering status of the player
	*
	* Updates the entering status of the player.
	* Used when the player is entering in a not yet cleared room.
	*/
	void setEntering();

	/*!
	* \brief returns if the player can move or not
	*
	* Returns if the player can move or not.
	*
	* \return : True if the player can move
	*/
	bool canMove();

	/*!
	* \brief called when the player is dying
	*
	* Called when the player is dying (HP <= 0).
	*/
	virtual void dying();

	/*!
	* \brief hurts the player
	*
	* Hurts the player.
	* Calld when the player is hurt, usually when colliding with a monster or a missile.
	*
	* \param damages : the inflicted damages
	* \param hurtingType : damages type
	* \return : True if the player has been hurt
	*/
	- virtual bool hurt(int damages, enumBoltType hurtingType);
	+ virtual bool hurt(int damages, enumShotType hurtingType);

	/*!
	* \brief returns if the player is dead or not
	*
	* Returns if the player is dead or not.
	*
	* \return : True if the player is dead
	*/
	bool isDead();

	/*!
	* \brief returns the fire delay percentage
	*
	* Returns the fire delay percentage.
	* Used (currently) when displaying the blue bar in the HUD.
	*
	* \return : the percentage (between 0.0f for empty to 1.0 for full)
	*/
	float getPercentFireDelay();

	/*!
	* \brief called when the player get an item
	*
	* Called when the player get an item.
	* When the item is an equip item, he starts an "acquiring stance".
	*
	* \param type : item ID
	*/
	void acquireItem(enumItemType type);

	/*!
	* \brief makes the player drop an item
	*
	* Makes the player drop an item.
	* Called when the player dies.
	*
	* \param itemType : item ID
	* \param isEquip : True if it's an equip item (not the same texture)
	*/
	void loseItem(enumItemType itemType, bool isEquip);

	/*!
	* \brief starts the acquire stance
	*
	* Starts the acquire stance.
	* Called when the player get an equip object. The item is "highlighted" and a description is displayed.
	*
	* \param type : item ID
	*/
	void acquireStance(enumItemType type);

	/*!
	* \brief starts the opening stance
	*
	* Starts the boss door opening animation.
	* Remove the key from the inventory.
	*/
	void useBossKey();

	/*!
	* \brief accessor on the gold
	*
	* Accessor on the gold.
	*
	* \return : the gold
	*/
	int getGold() {return gold; }

	/*!
	* \brief mutator on the gold
	*
	* Mutator on the gold.
	*
	* \param gold : the new gold value
	*/
	void setGold(int gold) { this->gold = gold; }

	/*!
	* \brief pay some gold
	*
	* Pay some gold. Usually in shops.
	*
	* \param gold : the price to pay
	*/
	void pay(int price);

	/*!
	* \brief accessor on the colliding direction
	*
	* Accessor on the colliding direction.
	*
	* \return : the colliding direction
	*/
	int getCollidingDirection();

	+ /*!
	+ * \brief register a new special shot and select it
	+ *
	+ * Register a new special shot and select it.
	+ *
	+ * \param item : Item which provides the shot
	+ */
	+ void registerSpecialShot(int item);
	+
	+ /*!
	+ * \brief accessor on current shot type
	+ *
	+ * Accessor on the current shot type.
	+ *
	+ * \return : the current shot type
	+ */
	+ enumShotType getShotType();
	+
	+ /*!
	+ * \brief accessor on current shot index
	+ *
	+ * Accessor on the current shot index.
	+ *
	+ * \return : the current shot index
	+ */
	+ int getShotIndex();
	+
	+ /*!
	+ * \brief mutator on the shot index
	+ *
	+ * Mutator on the shot index.
	+ *
	+ * \param index : the new shot index
	+ */
	+ void setShotIndex(int index);
	+
	+ /*!
	+ * \brief accessor on current shot type of a slot
	+ *
	+ * Accessor on the current shot type of a slot.
	+ *
	+ * \param slot : The slot number
	+ * \return : the current shot type
	+ */
	+ enumShotType getShotType(int slot);
	+
	+ /*!
	+ * \brief mutator on a shot slot
	+ *
	+ * Mutator on a shot slot.
	+ *
	+ * \param index : the shot index
	+ * \param shotType : the shot type to set
	+ */
	+ void setShotType(int slot, enumShotType shotType);
	+
	/** Player status enum
	* The different player states.
	*/
	enum playerStatusEnum
	{
	playerStatusPlaying, /*< Player is playing "normally" /
	playerStatusEntering, /*< Player is entering a not yet cleared room (walking is forced) /
	playerStatusAcquire, /*< Player is under acquiring stance /
	playerStatusUnlocking, /*< Player is under unlocking stance /
	playerStatusDead /*< Player RIP /
	};
	protected:
	void computePlayer();
	virtual void readCollidingEntity(CollidingSpriteEntity* entity);
	void generateBolt(float velx, float vely);

	virtual void collideMapRight();
	virtual void collideMapLeft();
	virtual void collideMapTop();
	virtual void collideMapBottom();

	private:
	int fireDamages;
	float fireVelocity;
	float fireDelay;
	float currentFireDelay;
	float boltLifeTime;
	int gold;

	bool canFirePlayer;
	playerStatusEnum playerStatus;
	float acquireDelay;
	enumItemType acquiredItem;

	bool equip[NUMBER_EQUIP_ITEMS];
	- enumBoltType boltType;
	+ //enumBoltType boltType;
	float specialBoltTimer;
	+ enumShotType specialShots[SPECIAL_SHOT_SLOTS];
	+ int specialShotIndex;

	int collidingDirection; /!< Colliding direction (4, 8, 6, 2) to detect collision with closed doors /

	int facingDirection;
	int firingDirection;

	FairyEntity* fairy;
	+
	+ void renderHead(sf::RenderWindow* app);
	+ void renderBody(sf::RenderWindow* app);
	+ void renderArms(sf::RenderWindow* app);
	+ void renderFeet(sf::RenderWindow* app);
	+ void renderStaff(sf::RenderWindow* app);
	};

	#endif // PLAYERSPRITE_H
	diff --git a/src/WitchBlastGame.cpp b/src/WitchBlastGame.cpp
	index 7dccb10..40b4252 100644
	--- a/src/WitchBlastGame.cpp
	+++ b/src/WitchBlastGame.cpp
	@@ -1,1287 +1,1299 @@
	#include "WitchBlastGame.h"
	#include "sfml_game/SpriteEntity.h"
	#include "sfml_game/TileMapEntity.h"
	#include "DungeonMap.h"
	#include "sfml_game/ImageManager.h"
	#include "sfml_game/SoundManager.h"
	#include "sfml_game/EntityManager.h"
	#include "Constants.h"
	#include "RatEntity.h"
	#include "GreenRatEntity.h"
	#include "KingRatEntity.h"
	#include "BatEntity.h"
	#include "SlimeEntity.h"
	#include "ChestEntity.h"
	#include "EvilFlowerEntity.h"
	#include "ItemEntity.h"
	#include "ArtefactDescriptionEntity.h"
	#include "PnjEntity.h"
	#include "TextEntity.h"

	#include <iostream>
	#include <sstream>
	#include <fstream>

	namespace {
	WitchBlastGame* gameptr;
	}

	WitchBlastGame::WitchBlastGame(): Game(SCREEN_WIDTH, SCREEN_HEIGHT)
	{
	gameptr = this;
	app->setTitle(APP_NAME + " V" + APP_VERSION);

	// loading resources
	ImageManager::getImageManager()->addImage((char*)"media/sprite.png");
	ImageManager::getImageManager()->addImage((char*)"media/bolt.png");
	ImageManager::getImageManager()->addImage((char*)"media/tiles.png");
	ImageManager::getImageManager()->addImage((char*)"media/rat.png");
	ImageManager::getImageManager()->addImage((char*)"media/minimap.png");
	ImageManager::getImageManager()->addImage((char*)"media/doors.png");
	ImageManager::getImageManager()->addImage((char*)"media/items.png");
	ImageManager::getImageManager()->addImage((char*)"media/items_equip.png");
	ImageManager::getImageManager()->addImage((char*)"media/chest.png");
	ImageManager::getImageManager()->addImage((char*)"media/bat.png");
	ImageManager::getImageManager()->addImage((char*)"media/evil_flower.png");
	ImageManager::getImageManager()->addImage((char*)"media/slime.png");
	ImageManager::getImageManager()->addImage((char*)"media/king_rat.png");
	ImageManager::getImageManager()->addImage((char*)"media/blood.png");
	ImageManager::getImageManager()->addImage((char*)"media/corpses.png");
	ImageManager::getImageManager()->addImage((char*)"media/corpses_big.png");
	ImageManager::getImageManager()->addImage((char*)"media/star.png");
	ImageManager::getImageManager()->addImage((char*)"media/star2.png");
	ImageManager::getImageManager()->addImage((char*)"media/interface.png");
	ImageManager::getImageManager()->addImage((char*)"media/pnj.png");
	ImageManager::getImageManager()->addImage((char*)"media/fairy.png");

	SoundManager::getSoundManager()->addSound((char*)"media/sound/step.ogg");
	SoundManager::getSoundManager()->addSound((char*)"media/sound/blast00.ogg");
	SoundManager::getSoundManager()->addSound((char*)"media/sound/blast01.ogg");
	SoundManager::getSoundManager()->addSound((char*)"media/sound/door_closing.ogg");
	SoundManager::getSoundManager()->addSound((char*)"media/sound/door_opening.ogg");
	SoundManager::getSoundManager()->addSound((char*)"media/sound/chest_opening.ogg");
	SoundManager::getSoundManager()->addSound((char*)"media/sound/impact.ogg");
	SoundManager::getSoundManager()->addSound((char*)"media/sound/bonus.ogg");
	SoundManager::getSoundManager()->addSound((char*)"media/sound/drink.ogg");
	SoundManager::getSoundManager()->addSound((char*)"media/sound/player_hit.ogg");
	SoundManager::getSoundManager()->addSound((char*)"media/sound/player_die.ogg");
	SoundManager::getSoundManager()->addSound((char*)"media/sound/ennemy_dying.ogg");
	SoundManager::getSoundManager()->addSound((char*)"media/sound/coin.ogg");
	SoundManager::getSoundManager()->addSound((char*)"media/sound/pay.ogg");
	SoundManager::getSoundManager()->addSound((char*)"media/sound/wall_impact.ogg");
	SoundManager::getSoundManager()->addSound((char*)"media/sound/big_wall_impact.ogg");
	SoundManager::getSoundManager()->addSound((char*)"media/sound/king_rat_cry_1.ogg");
	SoundManager::getSoundManager()->addSound((char*)"media/sound/king_rat_cry_2.ogg");
	SoundManager::getSoundManager()->addSound((char*)"media/sound/king_rat_die.ogg");
	SoundManager::getSoundManager()->addSound((char*)"media/sound/slime_jump.ogg");
	SoundManager::getSoundManager()->addSound((char*)"media/sound/slime_impact.ogg");
	SoundManager::getSoundManager()->addSound((char*)"media/sound/slime_impact_weak.ogg");
	SoundManager::getSoundManager()->addSound((char*)"media/sound/ice_charge.ogg");

	if (font.loadFromFile("media/DejaVuSans-Bold.ttf"))
	{
	myText.setFont(font);
	}

	miniMap = NULL;
	currentMap = NULL;
	currentFloor = NULL;
	xGameState = xGameStateNone;
	isPausing = false;
	}

	WitchBlastGame::~WitchBlastGame()
	{
	// cleaning all entities
	EntityManager::getEntityManager()->clean();

	// cleaning data
	if (miniMap != NULL) delete (miniMap);
	if (currentFloor != NULL) delete (currentFloor);
	}

	DungeonMap* WitchBlastGame::getCurrentMap()
	{
	return currentMap;
	}

	PlayerEntity* WitchBlastGame::getPlayer()
	{
	return player;
	}

	void WitchBlastGame::onUpdate()
	{
	float delta = getAbsolutTime() - lastTime;
	lastTime = getAbsolutTime();

	if (!isPausing)
	{

	EntityManager::getEntityManager()->animate(delta);

	if (xGameState != xGameStateNone)
	{
	xGameTimer -= delta;
	if (xGameTimer <= 0.0f)
	{
	if (xGameState == xGameStateFadeOut)
	startNewGame(false);
	else
	xGameState = xGameStateNone;
	}
	}

	if (isPlayerAlive)
	{
	if (player->getHp() <= 0)
	{
	isPlayerAlive = false;
	playMusic(MusicEnding);
	}
	}
	}
	}

	void WitchBlastGame::startNewGame(bool fromSaveFile)
	{
	gameState = gameStateInit;

	// cleaning all entities
	EntityManager::getEntityManager()->clean();

	// cleaning data
	if (miniMap != NULL) delete (miniMap);
	if (currentFloor != NULL) delete (currentFloor);

	if (fromSaveFile)
	{
	if (!loadGame()) fromSaveFile = false;
	}
	if (!fromSaveFile)
	{
	currentFloor = new GameFloor(1);
	floorX = FLOOR_WIDTH / 2;
	floorY = FLOOR_HEIGHT / 2;

	// the player
	player = new PlayerEntity(OFFSET_X + (TILE_WIDTH * MAP_WIDTH * 0.5f),
	OFFSET_Y + (TILE_HEIGHT * MAP_HEIGHT * 0.5f));

	// the boss room is closed
	bossRoomOpened = false;
	}

	// current map (tiles)
	currentTileMap = new TileMapEntity(ImageManager::getImageManager()->getImage(IMAGE_TILES), currentMap, 64, 64, 10);
	currentTileMap->setX(OFFSET_X);
	currentTileMap->setY(OFFSET_Y);

	miniMap = new GameMap(FLOOR_WIDTH, FLOOR_HEIGHT);
	refreshMinimap();

	// the interface
	SpriteEntity* interface = new SpriteEntity(ImageManager::getImageManager()->getImage(IMAGE_INTERFACE));
	interface->setZ(10000.0f);
	interface->removeCenter();
	interface->setType(0);

	// key symbol on the interface
	keySprite.setTexture(*ImageManager::getImageManager()->getImage(IMAGE_ITEMS_EQUIP));
	keySprite.setTextureRect(sf::IntRect(ITEM_WIDTH * EQUIP_BOSS_KEY, 0, ITEM_WIDTH, ITEM_HEIGHT));
	keySprite.setPosition(326, 616);

	// minimap on the interface
	TileMapEntity* miniMapEntity = new TileMapEntity(ImageManager::getImageManager()->getImage(4), miniMap, 15, 11, 10);
	miniMapEntity->setTileBox(16, 12);
	miniMapEntity->setX(407);
	miniMapEntity->setY(614);
	miniMapEntity->setZ(10001.0f);

	// doors
	doorEntity[0] = new DoorEntity(8);
	doorEntity[1] = new DoorEntity(4);
	doorEntity[2] = new DoorEntity(2);
	doorEntity[3] = new DoorEntity(6);

	isPlayerAlive = true;

	// generate the map
	refreshMap();
	// items from save
	currentMap->restoreMapObjects();

	// first map is open
	roomClosed = false;

	// game time counter an state
	lastTime = getAbsolutTime();
	gameState = gameStatePlaying;

	playMusic(MusicDungeon);

	// fade in
	xGameState = xGameStateFadeIn;
	xGameTimer = FADE_IN_DELAY;

	float x0 = OFFSET_X + MAP_WIDTH * 0.5f * TILE_WIDTH;
	float y0 = OFFSET_Y + MAP_HEIGHT * 0.5f * TILE_HEIGHT + 40.0f;

	TextEntity* text = new TextEntity("Level 1", 30, x0, y0);
	text->setAlignment(ALIGN_CENTER);
	text->setLifetime(2.5f);
	text->setWeight(-36.0f);
	text->setZ(1000);
	text->setColor(TextEntity::COLOR_FADING_WHITE);
	}

	void WitchBlastGame::startGame()
	{
	startNewGame(true);

	// Start game loop
	while (app->isOpen())
	{
	// Process events
	sf::Event event;

	while (app->pollEvent(event))
	{
	// Close window : exit
	if (event.type == sf::Event::Closed)
	{
	if (gameState == gameStatePlaying && !player->isDead() && currentMap->isCleared()) saveGame();
	app->close();
	}

	if (event.type == sf::Event::KeyPressed)
	{
	if (event.key.code == sf::Keyboard::Escape)
	{
	if (gameState == gameStatePlaying && !isPausing) isPausing = true;
	else if (gameState == gameStatePlaying && isPausing) isPausing = false;
	}

	if (event.key.code == sf::Keyboard::Space)
	{
	if (gameState == gameStatePlaying && !isPausing) firingDirection = player->getFacingDirection();
	}

	if (event.key.code == sf::Keyboard::X)
	{
	startNewGame(false);
	}
	}

	if (event.type == sf::Event::LostFocus)
	isPausing = true;
	}

	if (gameState == gameStatePlaying && !isPausing)
	{
	if (player->canMove()) player->setVelocity(Vector2D(0.0f, 0.0f));

	if (sf::Keyboard::isKeyPressed(sf::Keyboard::Q) \|\| sf::Keyboard::isKeyPressed(sf::Keyboard::A))
	{
	if (sf::Keyboard::isKeyPressed(sf::Keyboard::Z) \|\| sf::Keyboard::isKeyPressed(sf::Keyboard::W))
	player->move(7);
	else if (sf::Keyboard::isKeyPressed(sf::Keyboard::S))
	player->move(1);
	else
	player->move(4);
	}
	else if (sf::Keyboard::isKeyPressed(sf::Keyboard::D))
	{
	if (sf::Keyboard::isKeyPressed(sf::Keyboard::Z) \|\| sf::Keyboard::isKeyPressed(sf::Keyboard::W))
	player->move(9);
	else if (sf::Keyboard::isKeyPressed(sf::Keyboard::S))
	player->move(3);
	else
	player->move(6);
	}
	else if (sf::Keyboard::isKeyPressed(sf::Keyboard::Z) \|\| sf::Keyboard::isKeyPressed(sf::Keyboard::W))
	{
	player->move(8);
	}
	else if (sf::Keyboard::isKeyPressed(sf::Keyboard::S))
	{
	player->move(2);
	}

	// normal 4 directions gameplay
	if (sf::Keyboard::isKeyPressed(sf::Keyboard::Left))
	player->fire(4);
	else if (sf::Keyboard::isKeyPressed(sf::Keyboard::Right))
	player->fire(6);
	else if (sf::Keyboard::isKeyPressed(sf::Keyboard::Up))
	player->fire(8);
	else if (sf::Keyboard::isKeyPressed(sf::Keyboard::Down))
	player->fire(2);
	// alternative "one button" gameplay
	else if (sf::Keyboard::isKeyPressed(sf::Keyboard::Space))
	{
	player->fire(firingDirection);
	}
	// alternative "firing with the mouse" gameplay
	else if (sf::Mouse::isButtonPressed(sf::Mouse::Left))
	{
	sf::Vector2i mousePosition = sf::Mouse::getPosition(*app);
	int xm = mousePosition.x - player->getX();
	int ym = mousePosition.y - player->getY();

	if (abs(xm) >= abs(ym))
	{
	if (xm > 0) player->fire(6);
	else player->fire(4);
	}
	else
	{
	if (ym > 0) player->fire(2);
	else player->fire(8);
	}
	}

	if (player->isDead() && xGameState == xGameStateNone && sf::Keyboard::isKeyPressed(sf::Keyboard::Return))
	{
	xGameState = xGameStateFadeOut;
	xGameTimer = FADE_OUT_DELAY;
	}
	}

	onUpdate();
	EntityManager::getEntityManager()->sortByZ();
	onRender();

	verifyDoorUnlocking();

	if (roomClosed)
	{
	if (getEnnemyCount() == 0)
	{
	currentMap->setCleared(true);
	openDoors();
	}
	}
	}
	quitGame();
	}

	void WitchBlastGame::createFloor()
	{
	// TODO : extracts from createNewGame
	}

	void WitchBlastGame::closeDoors()
	{
	if (!currentMap->isCleared())
	{
	int i;
	for(i = 0; i < MAP_WIDTH; i++)
	{
	if (currentMap->getTile(i, 0) < 4) currentMap->setTile(i, 0, MAP_DOOR);
	if (currentMap->getTile(i, MAP_HEIGHT - 1) < 4) currentMap->setTile(i, MAP_HEIGHT - 1, MAP_DOOR);
	}
	for(i = 0; i < MAP_HEIGHT; i++)
	{
	if (currentMap->getTile(0, i) < 4) currentMap->setTile(0, i, MAP_DOOR);
	if (currentMap->getTile(MAP_WIDTH - 1, i) < 4) currentMap->setTile(MAP_WIDTH - 1, i, MAP_DOOR);
	}
	roomClosed = true;
	}
	}

	void WitchBlastGame::openDoors()
	{
	int i, j;
	for(i = 0; i < MAP_WIDTH; i++)
	for(j = 0; j < MAP_WIDTH; j++)
	if (currentMap->getTile(i, j) == MAP_DOOR) currentMap->setTile(i, j, 0);
	roomClosed = false;
	SoundManager::getSoundManager()->playSound(SOUND_DOOR_OPENING);

	if (currentMap->hasNeighbourUp() == 2 && !bossRoomOpened)
	currentMap->setTile(MAP_WIDTH/2, 0, MAP_DOOR);
	else
	doorEntity[0]->openDoor();

	if (currentMap->hasNeighbourLeft() == 2 && !bossRoomOpened)
	currentMap->setTile(0, MAP_HEIGHT / 2, MAP_DOOR);
	else
	doorEntity[1]->openDoor();

	if (currentMap->hasNeighbourDown() == 2 && !bossRoomOpened)
	currentMap->setTile(MAP_WIDTH / 2, MAP_HEIGHT - 1, MAP_DOOR);
	else
	doorEntity[2]->openDoor();

	if (currentMap->hasNeighbourRight() == 2 && !bossRoomOpened)
	currentMap->setTile(MAP_WIDTH - 1, MAP_HEIGHT / 2, MAP_DOOR);
	else
	doorEntity[3]->openDoor();
	}

	int WitchBlastGame::getEnnemyCount()
	{
	int n=0;

	EntityManager::EntityList* entityList =EntityManager::getEntityManager()->getList();
	EntityManager::EntityList::iterator it;

	for (it = entityList->begin (); it != entityList->end ();)
	{
	GameEntity e = it;
	it++;

	if (e->getType() >= 20)
	{
	n++;
	} // endif
	} // end for

	return n;
	}

	void WitchBlastGame::refreshMap()
	{
	// clean the sprites from old map
	EntityManager::getEntityManager()->partialClean(10);

	// if new map, it has to be randomized
	bool generateMap = !(currentFloor->getMap(floorX, floorY)->isVisited());
	currentMap = currentFloor->getAndVisitMap(floorX, floorY);

	// load the map
	currentTileMap->setMap(currentMap);
	player->setMap(currentMap, TILE_WIDTH, TILE_HEIGHT, OFFSET_X, OFFSET_Y);
	refreshMinimap();

	if(generateMap)
	this->generateMap();
	else
	{
	if (currentMap->getRoomType() == roomTypeMerchant)
	new PnjEntity(OFFSET_X + (MAP_WIDTH / 2) * TILE_WIDTH + TILE_WIDTH / 2,
	OFFSET_Y + (MAP_HEIGHT / 2 - 2) * TILE_HEIGHT,
	0);
	}

	// for testing purpose (new stuff)
	if (player->getAge() <2.0f)
	{
	/ItemEntity book = new ItemEntity(ItemEntity::itemHealth, player->getX(), player->getY()- 180);
	book->setMap(currentMap, TILE_WIDTH, TILE_HEIGHT, OFFSET_X, OFFSET_Y);
	book->setMerchandise(true);*/

	/*int bonusType = getRandomEquipItem(true);
	ItemEntity* boots = new ItemEntity((enumItemType)(itemMagicianHat + bonusType), player->getX(), player->getY()+ 180);
	boots->setMap(currentMap, TILE_WIDTH, TILE_HEIGHT, OFFSET_X, OFFSET_Y);*/

	//ChestEntity* chest = new ChestEntity(player->getX() + 100, player->getY()+ 150, CHEST_FAIRY, false);
	//chest->setMap(currentMap, TILE_WIDTH, TILE_HEIGHT, OFFSET_X, OFFSET_Y);
	}

	// check doors
	doorEntity[0]->setVisible(currentMap->hasNeighbourUp() > 0);
	if (currentMap->hasNeighbourUp() == 1) doorEntity[0]->setDoorType(0);
	if (currentMap->hasNeighbourUp() == 2 \|\| currentMap->getRoomType()==roomTypeBoss) doorEntity[0]->setDoorType(1);
	if (currentMap->hasNeighbourUp() == 2 && !bossRoomOpened)
	{
	doorEntity[0]->setOpen(false);
	currentMap->setTile(MAP_WIDTH/2, 0, MAP_DOOR);
	}
	else
	doorEntity[0]->setOpen(true);

	doorEntity[3]->setVisible(currentMap->hasNeighbourRight() > 0);
	if (currentMap->hasNeighbourRight() == 1) doorEntity[3]->setDoorType(0);
	if (currentMap->hasNeighbourRight() == 2 \|\| currentMap->getRoomType()==roomTypeBoss) doorEntity[3]->setDoorType(1);
	if (currentMap->hasNeighbourRight() == 2 && !bossRoomOpened)
	{
	doorEntity[3]->setOpen(false);
	currentMap->setTile(MAP_WIDTH - 1, MAP_HEIGHT / 2, MAP_DOOR);
	}
	else
	doorEntity[3]->setOpen(true);

	doorEntity[2]->setVisible(currentMap->hasNeighbourDown() > 0);
	if (currentMap->hasNeighbourDown() == 1) doorEntity[2]->setDoorType(0);
	if (currentMap->hasNeighbourDown() == 2 \|\| currentMap->getRoomType()==roomTypeBoss) doorEntity[2]->setDoorType(1);
	if (currentMap->hasNeighbourDown() == 2 && !bossRoomOpened)
	{
	doorEntity[2]->setOpen(false);
	currentMap->setTile(MAP_WIDTH/2, MAP_HEIGHT - 1, MAP_DOOR);
	}
	else
	doorEntity[2]->setOpen(true);

	doorEntity[1]->setVisible(currentMap->hasNeighbourLeft() > 0);
	if (currentMap->hasNeighbourLeft() == 1) doorEntity[1]->setDoorType(0);
	if (currentMap->hasNeighbourLeft() == 2 \|\| currentMap->getRoomType()==roomTypeBoss) doorEntity[1]->setDoorType(1);
	if (currentMap->hasNeighbourLeft() == 2 && !bossRoomOpened)
	{
	doorEntity[1]->setOpen(false);
	currentMap->setTile(0, MAP_HEIGHT / 2, MAP_DOOR);
	}
	else
	doorEntity[1]->setOpen(true);
	}

	void WitchBlastGame::refreshMinimap()
	{
	for (int j=0; j < FLOOR_HEIGHT; j++)
	for (int i=0; i < FLOOR_WIDTH; i++)
	{
	int n = currentFloor->getRoom(i, j);
	if (n > 0 && currentFloor->getMap(i, j)->isVisited())
	{
	if (currentFloor->getRoom(i, j) == roomTypeStarting
	\|\| currentFloor->getRoom(i, j) == roomTypeBonus
	\|\| currentFloor->getRoom(i, j) == roomTypeKey)
	miniMap->setTile(i, j, roomTypeStandard);
	else
	miniMap->setTile(i, j, currentFloor->getRoom(i, j));
	}
	else if (n > 0 && currentFloor->getMap(i, j)->isKnown())
	{
	if (currentFloor->getRoom(i, j) == roomTypeBoss)
	miniMap->setTile(i, j, 7);
	else
	miniMap->setTile(i, j, 9);
	}
	else
	miniMap->setTile(i, j, 0);
	}
	miniMap->setTile(floorX, floorY, 8);
	}

	void WitchBlastGame::checkEntering()
	{
	if (!currentMap->isCleared())
	{
	player->setEntering();
	SoundManager::getSoundManager()->playSound(SOUND_DOOR_CLOSING);
	for (int i=0; i<4; i++)
	doorEntity[i]->closeDoor();
	}
	}

	void WitchBlastGame::saveMapItems()
	{
	EntityManager::EntityList* entityList = EntityManager::getEntityManager()->getList();
	EntityManager::EntityList::iterator it;

	for (it = entityList->begin (); it != entityList->end ();)
	{
	GameEntity* e = *it;
	it++;

	ItemEntity* itemEntity = dynamic_cast<ItemEntity*>(e);
	ChestEntity* chestEntity = dynamic_cast<ChestEntity*>(e);

	if (itemEntity != NULL)
	{
	currentMap->addItem(itemEntity->getItemType(), itemEntity->getX(), itemEntity->getY(), itemEntity->getMerchandise());
	} // endif
	else if (chestEntity != NULL)
	{
	currentMap->addChest(chestEntity->getChestType(), chestEntity->getOpened(), chestEntity->getX(), chestEntity->getY());
	} // endif
	else
	{
	SpriteEntity* spriteEntity = dynamic_cast<SpriteEntity*>(e);
	if (spriteEntity != NULL && (e->getType() == ENTITY_BLOOD \|\| e->getType() == ENTITY_CORPSE ) )
	{
	int spriteFrame = spriteEntity->getFrame();
	if (spriteEntity->getWidth() == 128) spriteFrame += FRAME_CORPSE_KING_RAT;
	currentMap->addSprite(e->getType(), spriteFrame, e->getX(), e->getY(), spriteEntity->getScaleX());
	}

	}
	} // end for
	}

	void WitchBlastGame::moveToOtherMap(int direction)
	{
	saveMapItems();
	switch (direction)
	{
	case (4): floorX--; player->moveTo((OFFSET_X + MAP_WIDTH * TILE_WIDTH), player->getY()); player->move(4); break;
	case (6): floorX++; player->moveTo(OFFSET_X, player->getY()); player->move(6); break;
	case (8): floorY--; player->moveTo(player->getX(), OFFSET_Y + MAP_HEIGHT * TILE_HEIGHT - 10); player->move(8); break;
	case (2): floorY++; player->moveTo(player->getX(), OFFSET_Y); break;
	}
	refreshMap();
	checkEntering();
	currentMap->restoreMapObjects();
	}

	void WitchBlastGame::onRender()
	{
	// clear the view
	app->clear(sf::Color(32, 32, 32));

	// render the game objects
	EntityManager::getEntityManager()->render(app);

	myText.setColor(sf::Color(255, 255, 255, 255));
	myText.setCharacterSize(17);
	myText.setString("WASD or ZQSD to move\nArrows to shoot");
	myText.setPosition(650, 650);
	app->draw(myText);

	myText.setCharacterSize(18);
	std::ostringstream oss;
	oss << player->getGold();
	myText.setString(oss.str());
	myText.setPosition(690, 612);
	app->draw(myText);

	myText.setColor(sf::Color(0, 0, 0, 255));
	myText.setCharacterSize(16);
	myText.setString("Level 1");
	myText.setPosition(410, 692);
	app->draw(myText);

	sf::RectangleShape rectangle(sf::Vector2f(200, 25));
	// life

	if (gameState == gameStatePlaying)
	{
	// life and mana
	rectangle.setFillColor(sf::Color(190, 20, 20));
	rectangle.setPosition(sf::Vector2f(90, 622));
	rectangle.setSize(sf::Vector2f(200.0f * (float)(player->getHpDisplay()) / (float)(player->getHpMax()) , 25));
	app->draw(rectangle);

	rectangle.setFillColor(sf::Color(255, 190, 190));
	rectangle.setPosition(sf::Vector2f(90, 625));
	rectangle.setSize(sf::Vector2f(200.0f * (float)(player->getHpDisplay()) / (float)(player->getHpMax()) , 2));
	app->draw(rectangle);

	rectangle.setFillColor(sf::Color(20, 20, 190));
	rectangle.setPosition(sf::Vector2f(90, 658));
	rectangle.setSize(sf::Vector2f(200.0f * player->getPercentFireDelay() , 25));
	app->draw(rectangle);

	rectangle.setFillColor(sf::Color(190, 190, 255));
	rectangle.setPosition(sf::Vector2f(90, 661));
	rectangle.setSize(sf::Vector2f(200.0f * player->getPercentFireDelay() , 2));
	app->draw(rectangle);

	// drawing the key on the interface
	if (player->isEquiped(EQUIP_BOSS_KEY)) app->draw(keySprite);

	if (isPausing)
	{
	rectangle.setFillColor(sf::Color(0, 0, 0, 160));
	rectangle.setPosition(sf::Vector2f(OFFSET_X, OFFSET_Y));
	rectangle.setSize(sf::Vector2f(MAP_WIDTH * TILE_WIDTH, MAP_HEIGHT * TILE_HEIGHT));
	app->draw(rectangle);

	float x0 = OFFSET_X + (MAP_WIDTH / 2) * TILE_WIDTH + TILE_WIDTH / 2;
	int fade = 50 + 205 * (1.0f + cos(3.0f * getAbsolutTime())) * 0.5f;
	myText.setColor(sf::Color(255, 255, 255, fade));
	myText.setCharacterSize(40);
	myText.setString("PAUSE");
	myText.setPosition(x0 - myText.getLocalBounds().width / 2, 300);
	app->draw(myText);
	}

	if (player->isDead())
	{
	float x0 = OFFSET_X + (MAP_WIDTH / 2) * TILE_WIDTH + TILE_WIDTH / 2;
	int fade = 255 * (1.0f + cos(2.0f * getAbsolutTime())) * 0.5f;

	myText.setColor(sf::Color(255, 255, 255, 255));
	myText.setCharacterSize(25);
	myText.setString("GAME OVER");
	myText.setPosition(x0 - myText.getLocalBounds().width / 2, 400);
	app->draw(myText);

	myText.setColor(sf::Color(255, 255, 255, fade));
	myText.setCharacterSize(20);
	myText.setString("Press [ENTER] to play again !");
	myText.setPosition(x0 - myText.getLocalBounds().width / 2, 440);
	app->draw(myText);
	}
	else if (currentMap->getRoomType() == roomTypeExit)
	{
	float x0 = OFFSET_X + (MAP_WIDTH / 2) * TILE_WIDTH + TILE_WIDTH / 2;
	myText.setColor(sf::Color(255, 255, 255, 255));
	myText.setCharacterSize(25);
	myText.setString("CONGRATULATIONS !\nYou've challenged this demo and\nmanaged to kill the boss !\nSee you soon for new adventures !");
	myText.setPosition(x0 - myText.getLocalBounds().width / 2, 220);
	app->draw(myText);
	}

	if (xGameState == xGameStateFadeIn)
	{
	// fade in
	rectangle.setFillColor(sf::Color(0, 0, 0, 255 - ((FADE_IN_DELAY - xGameTimer) / FADE_IN_DELAY) * 255));
	rectangle.setPosition(sf::Vector2f(OFFSET_X, OFFSET_Y));
	rectangle.setSize(sf::Vector2f(MAP_WIDTH * TILE_WIDTH , MAP_HEIGHT * TILE_HEIGHT));
	app->draw(rectangle);
	}
	else if (xGameState == xGameStateFadeOut)
	{
	// fade out
	rectangle.setFillColor(sf::Color(0, 0, 0, ((FADE_IN_DELAY - xGameTimer) / FADE_IN_DELAY) * 255));
	rectangle.setPosition(sf::Vector2f(OFFSET_X, OFFSET_Y));
	rectangle.setSize(sf::Vector2f(MAP_WIDTH * TILE_WIDTH , MAP_HEIGHT * TILE_HEIGHT));
	app->draw(rectangle);
	}
	}

	app->display();
	}

	void WitchBlastGame::generateBlood(float x, float y, BaseCreatureEntity::enumBloodColor bloodColor)
	{
	// double blood if the "Blood Snake3 object is equipped
	int nbIt;
	if (player->isEquiped(EQUIP_BLOOD_SNAKE))
	nbIt = 2;
	else
	nbIt = 1;

	for (int i=0; i < nbIt; i++)
	{
	SpriteEntity* blood = new SpriteEntity(ImageManager::getImageManager()->getImage(IMAGE_BLOOD), x, y, 16, 16, 6);
	blood->setZ(OFFSET_Y - 1);
	int b0 = 0;
	if (bloodColor == BaseCreatureEntity::bloodGreen) b0 += 6;
	blood->setFrame(b0 + rand()%6);
	blood->setType(ENTITY_BLOOD);
	blood->setVelocity(Vector2D(rand()%250));
	blood->setViscosity(0.95f);

	float bloodScale = 1.0f + (rand() % 10) * 0.1f;
	blood->setScale(bloodScale, bloodScale);
	}
	}

	void WitchBlastGame::showArtefactDescription(enumItemType itemType)
	{
	new ArtefactDescriptionEntity(itemType); //, &font);
	}

	void WitchBlastGame::generateMap()
	{
	if (currentMap->getRoomType() == roomTypeStandard)
	generateStandardMap();
	else if (currentMap->getRoomType() == roomTypeBonus)
	{
	currentMap->setCleared(true);
	Vector2D v = currentMap->generateBonusRoom();
	int bonusType = getRandomEquipItem(false);
	if (bonusType == EQUIP_FAIRY)
	{
	new ChestEntity(v.x, v.y, CHEST_FAIRY, false);
	}
	else
	{
	new ItemEntity( (enumItemType)(FirstEquipItem + bonusType), v.x ,v.y);
	}
	}
	else if (currentMap->getRoomType() == roomTypeKey)
	{
	Vector2D v = currentMap->generateKeyRoom();
	new ItemEntity( (enumItemType)(ItemBossKey), v.x ,v.y);
	initMonsterArray();
	int x0 = MAP_WIDTH / 2;
	int y0 = MAP_HEIGHT / 2;
	monsterArray[x0][y0] = true;
	findPlaceMonsters(MONSTER_RAT, 5);
	findPlaceMonsters(MONSTER_BAT, 5);
	}
	else if (currentMap->getRoomType() == roomTypeMerchant)
	{
	currentMap->generateMerchantRoom();

	ItemEntity* item1 = new ItemEntity(
	itemHealth,
	OFFSET_X + (MAP_WIDTH / 2 - 2) * TILE_WIDTH + TILE_WIDTH / 2,
	OFFSET_Y + (MAP_HEIGHT / 2) * TILE_HEIGHT);
	item1->setMerchandise(true);

	int bonusType = getRandomEquipItem(true);
	ItemEntity* item2 = new ItemEntity(
	(enumItemType)(FirstEquipItem + bonusType),
	OFFSET_X + (MAP_WIDTH / 2 + 2) * TILE_WIDTH + TILE_WIDTH / 2,
	OFFSET_Y + (MAP_HEIGHT / 2) * TILE_HEIGHT);
	item2->setMerchandise(true);

	new PnjEntity(OFFSET_X + (MAP_WIDTH / 2) * TILE_WIDTH + TILE_WIDTH / 2,
	OFFSET_Y + (MAP_HEIGHT / 2 - 2) * TILE_HEIGHT,
	0);

	currentMap->setCleared(true);
	}
	else if (currentMap->getRoomType() == roomTypeBoss)
	{
	currentMap->generateRoom(0);

	new KingRatEntity(OFFSET_X + (MAP_WIDTH / 2 - 2) * TILE_WIDTH + TILE_WIDTH / 2,
	OFFSET_Y + (MAP_HEIGHT / 2 - 2) * TILE_HEIGHT + TILE_HEIGHT / 2);
	}
	else if (currentMap->getRoomType() == roomTypeStarting)
	{
	currentMap->generateRoom(0);
	currentMap->setCleared(true);
	- int bonusType = getRandomEquipItem(false);
	+ int bonusType = EQUIP_GEM_ICE; //getRandomEquipItem(false);
	if (bonusType == EQUIP_FAIRY)
	{
	new ChestEntity(OFFSET_X + (TILE_WIDTH * MAP_WIDTH * 0.5f),
	OFFSET_Y + 120.0f + (TILE_HEIGHT * MAP_HEIGHT * 0.5f),
	CHEST_FAIRY, false);
	}
	else
	{
	new ItemEntity( (enumItemType)(FirstEquipItem + bonusType),
	OFFSET_X + (TILE_WIDTH * MAP_WIDTH * 0.5f),
	OFFSET_Y + 120.0f + (TILE_HEIGHT * MAP_HEIGHT * 0.5f));
	}
	}
	else if (currentMap->getRoomType() == roomTypeExit)
	{
	currentMap->generateRoom(0);
	currentMap->setCleared(true);
	}
	else
	currentMap->randomize(currentMap->getRoomType());
	}

	void WitchBlastGame::Write(std::string str, int size, float x, float y, int align, sf::Color color)
	{
	myText.setString(str);
	myText.setCharacterSize(size);
	myText.setColor(color);

	if (align == ALIGN_CENTER)
	myText.setPosition(x - myText.getLocalBounds().width / 2, y);
	else
	myText.setPosition(x, y);

	app->draw(myText);
	}

	void WitchBlastGame::initMonsterArray()
	{
	for (int i = 0; i < MAP_WIDTH; i++)
	for (int j = 0; j < MAP_HEIGHT; j++)
	monsterArray[i][j] = false;
	}

	void WitchBlastGame::addMonster(monster_type_enum monsterType, float xm, float ym)
	{
	switch (monsterType)
	{
	case MONSTER_RAT: new RatEntity(xm, ym - 2); break;
	case MONSTER_BAT: new BatEntity(xm, ym); break;
	case MONSTER_EVIL_FLOWER: new EvilFlowerEntity(xm, ym); break;
	case MONSTER_SLIME: new SlimeEntity(xm, ym); break;

	case MONSTER_KING_RAT: new KingRatEntity(xm, ym); break;
	}
	}

	void WitchBlastGame::findPlaceMonsters(monster_type_enum monsterType, int amount)
	{
	// find a suitable place
	bool isMonsterFlying = monsterType == MONSTER_BAT;

	bool bOk;
	int xm, ym;
	float xMonster, yMonster;

	for (int index = 0; index < amount; index++)
	{
	bOk = false;

	while (!bOk)
	{
	bOk = true;
	xm = 1 +rand() % (MAP_WIDTH - 3);
	ym = 1 +rand() % (MAP_HEIGHT - 3);
	if (monsterArray[xm][ym])
	{
	bOk = false;
	}
	if (bOk && !isMonsterFlying && !currentMap->isWalkable(xm, ym))
	{
	bOk = false;
	}
	if (bOk)
	{
	xMonster = OFFSET_X + xm * TILE_WIDTH + TILE_WIDTH * 0.5f;
	yMonster = OFFSET_Y + ym * TILE_HEIGHT+ TILE_HEIGHT * 0.5f;

	float dist2 = (xMonster - player->getX())(xMonster - player->getX()) + (yMonster - player->getY())(yMonster - player->getY());
	if ( dist2 < 75000.0f)
	{
	bOk = false;
	}
	else
	{
	addMonster(monsterType, xMonster, yMonster);
	monsterArray[xm][ym] = true;
	}
	}
	}
	}
	}

	void WitchBlastGame::generateStandardMap()
	{
	initMonsterArray();

	int random = rand() % 100;

	if (random < 16)
	{
	currentMap->generateRoom(rand()%3);
	findPlaceMonsters(MONSTER_RAT,4);
	}
	else if (random < 32)
	{
	currentMap->generateRoom(rand()%4);
	findPlaceMonsters(MONSTER_BAT,4);
	}
	else if (random < 48)
	{
	currentMap->generateRoom(rand()%4);
	findPlaceMonsters(MONSTER_EVIL_FLOWER,4);
	}
	else if (random < 64)
	{
	Vector2D v = currentMap->generateBonusRoom();
	new ChestEntity(v.x, v.y, CHEST_BASIC, false);
	currentMap->setCleared(true);
	}
	else if (random < 80)
	{
	currentMap->generateRoom(rand()%3);
	findPlaceMonsters(MONSTER_RAT,3);
	findPlaceMonsters(MONSTER_BAT,3);
	}
	else
	{
	currentMap->generateRoom(rand()%3);
	findPlaceMonsters(MONSTER_SLIME,8 + rand() % 5);
	}
	}

	item_equip_enum WitchBlastGame::getRandomEquipItem(bool toSale = false)
	{
	std::vector<int> bonusSet;
	int setSize = 0;
	for (int i = 0; i < NUMBER_EQUIP_ITEMS; i++)
	{
	if (!player->isEquiped(i) && i != EQUIP_BOSS_KEY)
	{
	if (!toSale \|\| i!= EQUIP_FAIRY)
	{
	bonusSet.push_back(i);
	setSize++;
	}
	}
	}
	int bonusType = 0;
	if (setSize > 0) bonusType = bonusSet[rand() % setSize];

	return (item_equip_enum) bonusType;
	}

	void WitchBlastGame::verifyDoorUnlocking()
	{
	int collidingDirection = (player->getCollidingDirection());

	if (collidingDirection > 0 && currentMap->isCleared() && !bossRoomOpened && player->isEquiped(EQUIP_BOSS_KEY))
	{
	int xt = (player->getX() - OFFSET_X) / TILE_WIDTH;
	int yt = (player->getY() - OFFSET_Y) / TILE_HEIGHT;

	if (yt <= 1 && xt >= MAP_WIDTH / 2 - 1 && xt <= MAP_WIDTH / 2 + 1 && currentMap->hasNeighbourUp() == 2)
	{
	doorEntity[0]->openDoor();
	currentMap->setTile(MAP_WIDTH / 2, 0, 0);
	SoundManager::getSoundManager()->playSound(SOUND_DOOR_OPENING);
	player->useBossKey();
	bossRoomOpened = true;
	}
	if (yt >= MAP_HEIGHT - 2 && xt >= MAP_WIDTH / 2 - 1 &&xt <= MAP_WIDTH / 2 + 1 && currentMap->hasNeighbourDown() == 2)
	{
	doorEntity[2]->openDoor();
	currentMap->setTile(MAP_WIDTH / 2, MAP_HEIGHT - 1, 0);
	SoundManager::getSoundManager()->playSound(SOUND_DOOR_OPENING);
	player->useBossKey();
	bossRoomOpened = true;
	}
	if (xt <= 1 && yt >= MAP_HEIGHT / 2 - 1 && yt <= MAP_HEIGHT / 2 + 1 && currentMap->hasNeighbourLeft() == 2)
	{

	doorEntity[1]->openDoor();
	currentMap->setTile(0, MAP_HEIGHT / 2, 0);
	SoundManager::getSoundManager()->playSound(SOUND_DOOR_OPENING);
	player->useBossKey();
	bossRoomOpened = true;
	}
	if (xt >= MAP_WIDTH - 2 && yt >= MAP_HEIGHT / 2 - 1 && yt <= MAP_HEIGHT / 2 + 1 && currentMap->hasNeighbourRight() == 2)
	{
	doorEntity[3]->openDoor();
	currentMap->setTile(MAP_WIDTH - 1, MAP_HEIGHT / 2, 0);
	SoundManager::getSoundManager()->playSound(SOUND_DOOR_OPENING);
	player->useBossKey();
	bossRoomOpened = true;
	}
	}
	}

	void WitchBlastGame::playMusic(musicEnum musicChoice)
	{
	music.stop();
	music.setLoop(true);
	bool ok = false;
	switch (musicChoice)
	{
	case MusicDungeon:
	ok = music.openFromFile("media/sound/track00.ogg");
	music.setVolume(75);
	break;

	case MusicEnding:
	ok = music.openFromFile("media/sound/track_ending.ogg");
	music.setVolume(35);
	break;
	}

	if (ok)
	music.play();
	}

	void WitchBlastGame::saveGame()
	{
	ofstream file("game.sav", ios::out \| ios::trunc);

	int i, j, k, l;

	if (file)
	{
	// floor
	int nbRooms = 0;
	for (j = 0; j < FLOOR_HEIGHT; j++)
	{
	for (i = 0; i < FLOOR_WIDTH; i++)
	{
	file << currentFloor->getRoom(i,j) << " ";
	if (currentFloor->getRoom(i,j) > 0) nbRooms++;
	}
	file << std::endl;
	}

	// maps
	saveMapItems();

	file << nbRooms << std::endl;
	for (j = 0; j < FLOOR_HEIGHT; j++)
	{
	for (i = 0; i < FLOOR_WIDTH; i++)
	{
	if (currentFloor->getRoom(i,j) > 0)
	{
	file << i << " " << j << " "
	<< currentFloor->getMap(i, j)->getRoomType() << " "
	<< currentFloor->getMap(i, j)->isKnown() << " "
	<< currentFloor->getMap(i, j)->isVisited() << " "
	<< currentFloor->getMap(i, j)->isCleared() << std::endl;
	if (currentFloor->getMap(i, j)->isVisited())
	{
	for (l = 0; l < MAP_HEIGHT; l++)
	{
	for (k = 0; k < MAP_WIDTH; k++)
	{
	file << currentFloor->getMap(i, j)->getTile(k, l) << " ";
	}
	file << std::endl;
	}
	// items, etc...
	std::list<DungeonMap::itemListElement> itemList = currentFloor->getMap(i, j)->getItemList();
	file << itemList.size() << std::endl;
	std::list<DungeonMap::itemListElement>::iterator it;
	for (it = itemList.begin (); it != itemList.end ();)
	{
	DungeonMap::itemListElement ilm = *it;
	it++;

	file << ilm.type << " " << ilm.x << " " << ilm.y << " " << ilm.merch << std::endl;
	}

	// chests
	std::list<DungeonMap::chestListElement> chestList = currentFloor->getMap(i, j)->getChestList();
	file << chestList.size() << std::endl;
	std::list<DungeonMap::chestListElement>::iterator itc;
	for (itc = chestList.begin (); itc != chestList.end ();)
	{
	DungeonMap::chestListElement ilm = *itc;
	itc++;

	file << ilm.type << " " << ilm.x << " " << ilm.y << " " << ilm.state << std::endl;
	}

	// sprites
	std::list<DungeonMap::spriteListElement> spriteList = currentFloor->getMap(i, j)->getSpriteList();
	file << spriteList.size() << std::endl;
	std::list<DungeonMap::spriteListElement>::iterator its;
	for (its = spriteList.begin (); its != spriteList.end ();)
	{
	DungeonMap::spriteListElement ilm = *its;
	its++;

	file << ilm.type << " " << ilm.frame << " " << ilm.x << " " << ilm.y << " " << ilm.scale << std::endl;
	}
	}
	}
	}
	file << std::endl;
	}

	// game
	file << floorX << " " << floorY << std::endl;
	file << bossRoomOpened << std::endl;
	// boss door !

	// player
	file << player->getHp() << " " << player->getHpMax() << " " << player->getGold() << std::endl;
	for (i = 0; i < NUMBER_EQUIP_ITEMS; i++) file << player->isEquiped(i) << " ";
	file << std::endl;
	file << player->getX() << " " << player->getY() << std::endl;
	+ file << player->getShotIndex();
	+ for (i = 0; i < SPECIAL_SHOT_SLOTS; i++) file << " " << player->getShotType(i);

	file.close();
	}
	else
	{
	cerr << "[ERROR] Saving the game..." << endl;
	}
	}

	bool WitchBlastGame::loadGame()
	{
	ifstream file("game.sav", ios::in);

	if (file)
	{
	int i, j, k, n;

	// floor
	currentFloor = new GameFloor();
	for (j = 0; j < FLOOR_HEIGHT; j++)
	{
	for (i = 0; i < FLOOR_WIDTH; i++)
	{
	int n;
	file >> n;
	currentFloor->setRoom(i, j, n);
	}
	}

	// maps
	int nbRooms;
	file >> nbRooms;

	for (k = 0; k < nbRooms; k++)
	{
	file >> i;
	file >> j;
	file >> n;
	DungeonMap* iMap = new DungeonMap(currentFloor, i, j);
	currentFloor->setMap(i, j, iMap);
	iMap->setRoomType((roomTypeEnum)n);
	bool flag;
	file >> flag;
	iMap->setKnown(flag);
	file >> flag;
	iMap->setVisited(flag);
	file >> flag;
	iMap->setCleared(flag);

	if (iMap->isVisited())
	{
	for (j = 0; j < MAP_HEIGHT; j++)
	{
	for (i = 0; i < MAP_WIDTH; i++)
	{
	file >> n;
	iMap->setTile(i, j, n);
	}
	}
	// items int the map
	file >> n;
	for (i = 0; i < n; i++)
	{
	int t;
	float x, y;
	bool merc;
	file >> t >> x >> y >> merc;
	iMap->addItem(t, x, y, merc);
	}
	// chests in the map
	file >> n;
	for (i = 0; i < n; i++)
	{
	int t;
	float x, y;
	bool state;
	file >> t >> x >> y >> state;
	iMap->addChest(t, state, x, y);
	}
	// sprites in the map
	file >> n;
	for (i = 0; i < n; i++)
	{
	int t, f;
	float x, y, scale;
	file >> t >> f >> x >> y >> scale;
	iMap->addSprite(t, f, x, y, scale);
	}
	}
	}

	// game
	file >> floorX >> floorY;
	currentMap = currentFloor->getMap(floorX, floorY);
	file >> bossRoomOpened;

	// player
	int hp, hpMax, gold;
	file >> hp >> hpMax >> gold;
	player = new PlayerEntity(OFFSET_X + (TILE_WIDTH * MAP_WIDTH * 0.5f),
	OFFSET_Y + (TILE_HEIGHT * MAP_HEIGHT * 0.5f));
	player->setHp(hp);
	player->setHpMax(hpMax);
	player->setGold(gold);
	for (i = 0; i < NUMBER_EQUIP_ITEMS; i++)
	{
	bool eq;
	file >> eq;
	player->setEquiped(i, eq);
	}
	float x, y;
	file >> x >> y;

	player->moveTo(x, y);

	+
	+ file >> n;
	+ player->setShotIndex(n);
	+
	+ for (i = 0; i < SPECIAL_SHOT_SLOTS; i++)
	+ {
	+ file >> n;
	+ player->setShotType(i, (enumShotType)n);
	+ }
	+
	file.close();
	remove("game.sav");
	}
	else
	{
	return false;
	}

	return true;
	}

	WitchBlastGame &game()
	{
	return *gameptr;
	}

File Metadata

Mime Type: text/x-diff
Expires: Thu, Jun 11, 11:33 AM (3 w, 4 d ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 68787
Default Alt Text: (101 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions