No OneTemporary
Actions

Authored By

Unknown

Size

123 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/ArtefactDescriptionEntity.cpp b/src/ArtefactDescriptionEntity.cpp
	index 17585d7..fefc37f 100644
	--- a/src/ArtefactDescriptionEntity.cpp
	+++ b/src/ArtefactDescriptionEntity.cpp
	@@ -1,111 +1,111 @@
	#include "ArtefactDescriptionEntity.h"
	#include "Constants.h"
	#include "sfml_game/ImageManager.h"
	#include "WitchBlastGame.h"
	#include "StaticTextEntity.h"

	ArtefactDescriptionEntity::ArtefactDescriptionEntity(ItemEntity::enumItemType itemType, WitchBlastGame* parent/, sf::Font my_font*/)
	: SpriteEntity (ImageManager::getImageManager()->getImage(IMAGE_ITEMS_EQUIP), 0, 0, ITEM_WIDTH, ITEM_HEIGHT)
	{
	//font = my_font;

	this->setLifetime(6.0f);

	this->setFrame(itemType - ItemEntity::itemMagicianHat);
	- this->setType(9);
	+ this->setType(ENTITY_ARTIFACT_DESCRIPTION);

	float x0 = OFFSET_X + MAP_WIDTH * TILE_WIDTH * 0.5f - ARTEFACT_RECT_WIDTH * 0.5f;

	rectangle.setSize(sf::Vector2f(ARTEFACT_RECT_WIDTH, ARTEFACT_RECT_HEIGHT));
	rectangle.setPosition(sf::Vector2f(x0, ARTEFACT_POS_Y));
	rectangle.setFillColor(sf::Color(20, 20, 70, 180));

	rectangleBorder.setSize(sf::Vector2f(ARTEFACT_RECT_WIDTH + ARTEFACT_BORDER * 2.0f,
	ARTEFACT_RECT_HEIGHT + ARTEFACT_BORDER * 2.0f));
	rectangleBorder.setPosition(sf::Vector2f(x0 - ARTEFACT_BORDER, ARTEFACT_POS_Y - ARTEFACT_BORDER));
	rectangleBorder.setFillColor(sf::Color(255, 255, 255, 180));

	this->parent = parent;

	this->x = x0 + 50.0f;
	this->y = 500.0f;
	sprite.setScale(3.5f, 3.5f);

	z = 5000.0f;

	switch (itemType)
	{
	case (ItemEntity::itemMagicianHat):
	artefactName = "Enchanter Hat"; artefactDescription = "Increases fire rate"; break;
	case (ItemEntity::itemLeatherBoots):
	artefactName = "Leather Boots"; artefactDescription = "Increases speed"; break;
	case (ItemEntity::itemBookDualShots):
	artefactName = "Spell : Dual Bolts"; artefactDescription = "Shoots two bolts"; break;
	case (ItemEntity::itemConcentrationAmulet):
	artefactName = "Concentration Amulet"; artefactDescription = "Increases fire range"; break;
	case (ItemEntity::itemBossKey):
	artefactName = "Boss Key"; artefactDescription = "Open the boss gate"; break;
	case (ItemEntity::itemVibrationGloves):
	artefactName = "Vibration Gloves"; artefactDescription = "Vibrations + slighty increases fire rate"; break;
	case (ItemEntity::itemMahoganyStaff):
	artefactName = "Mahogany Staff"; artefactDescription = "Increases bolt's speed and damages"; break;
	case (ItemEntity::itemFairy):
	artefactName = "Fairy"; artefactDescription = "Help you in the dungeon"; break;
	default: break;
	}
	}

	ArtefactDescriptionEntity::~ArtefactDescriptionEntity()
	{
	}

	void ArtefactDescriptionEntity::animate(float delay)
	{

	if (age < ARTEFACT_ZOOM_TIME)
	{
	float perc = 1.0f - age / ARTEFACT_ZOOM_TIME;
	sprite.setScale(3.5f + perc * 50.0f, 3.5f + perc * 50.0f);
	}
	else
	{
	sprite.setScale(3.5f, 3.5f);
	}
	SpriteEntity::animate(delay);
	}

	void ArtefactDescriptionEntity::render(sf::RenderWindow* app)
	{
	int nx = frame;
	int ny = 0;

	if (imagesProLine > 0)
	{
	nx = frame % imagesProLine;
	ny = frame / imagesProLine;
	}

	sprite.setTextureRect(sf::IntRect(nx * width, ny * height, /(nx + 1) / width, /(ny + 1) */ height));

	sprite.setPosition(x, y);
	sprite.setRotation(angle);

	if (isFading)
	{
	sprite.setColor(sf::Color(255, 255, 255, (sf::Uint8)(getFade() * 255)));
	}

	if (isShrinking)
	{
	sprite.setScale(getFade(), getFade());
	}


	app->draw(rectangleBorder);
	app->draw(rectangle);

	app->draw(sprite);

	StaticTextEntity::Write(app, artefactName, 22, 315.0f, ARTEFACT_POS_Y + 15.0f, ALIGN_LEFT, sf::Color(255, 255, 255));
	StaticTextEntity::Write(app, artefactDescription, 20, 315.0f, ARTEFACT_POS_Y + 55.0f, ALIGN_LEFT, sf::Color(255, 255, 255));
	}
	diff --git a/src/BatEntity.cpp b/src/BatEntity.cpp
	index b17c5cc..b9892cc 100644
	--- a/src/BatEntity.cpp
	+++ b/src/BatEntity.cpp
	@@ -1,124 +1,124 @@
	#include "BatEntity.h"
	#include "PlayerEntity.h"
	#include "sfml_game/SpriteEntity.h"
	#include "sfml_game/ImageManager.h"
	#include "sfml_game/SoundManager.h"
	#include "Constants.h"
	#include "WitchBlastGame.h"

	BatEntity::BatEntity(float x, float y, GameMap* map)
	: EnnemyEntity (ImageManager::getImageManager()->getImage(IMAGE_BAT), x, y, map)
	{
	creatureSpeed = BAT_SPEED;
	velocity = Vector2D(creatureSpeed);
	hp = BAT_HP;
	meleeDamages = BAT_DAMAGES;

	- type = 22;
	+ type = ENTITY_ENNEMY;
	bloodColor = bloodRed;
	changingDelay = -0.5f;
	shadowFrame = 3;
	}

	void BatEntity::animate(float delay)
	{
	changingDelay -= delay;
	if (changingDelay < 0.0f)
	{
	velocity = Vector2D(creatureSpeed);
	changingDelay = 0.5f + (float)(rand() % 2500) / 1000.0f;
	}
	if (age < 0.0f)
	frame = 1;
	else
	frame = ((int)(age * 5.0f)) % 2;

	testSpriteCollisions();
	EnnemyEntity::animate(delay);
	}

	void BatEntity::calculateBB()
	{
	boundingBox.left = (int)x - width / 2 + BAT_BB_LEFT;
	boundingBox.width = width - BAT_BB_WIDTH_DIFF;
	boundingBox.top = (int)y - height / 2 + BAT_BB_TOP;
	boundingBox.height = height - BAT_BB_HEIGHT_DIFF;
	}

	void BatEntity::collideMapRight()
	{
	// if (x > OFFSET_X + MAP_WIDTH * TILE_WIDTH)
	velocity.x = -velocity.x;
	}

	void BatEntity::collideMapLeft()
	{
	// if (x < OFFSET_X + MAP_WIDTH )
	velocity.x = -velocity.x;
	}

	void BatEntity::collideMapTop()
	{
	// if (y > OFFSET_Y + MAP_HEIGHT * TILE_HEIGHT)
	velocity.y = -velocity.y;
	}

	void BatEntity::collideMapBottom()
	{
	// if (y < OFFSET_Y + MAP_HEIGHT )
	velocity.y = -velocity.y;
	}

	bool BatEntity::collideWithMap(int direction)
	{
	calculateBB();

	int xTile0 = (boundingBox.left - offsetX) / tileWidth;
	int xTilef = (boundingBox.left + boundingBox.width - offsetX) / tileWidth;
	int yTile0 = (boundingBox.top - offsetY) / tileHeight;
	int yTilef = (boundingBox.top + boundingBox.height - offsetY) / tileHeight;

	if (boundingBox.top < 0) yTile0 = -1;

	for (int xTile = xTile0; xTile <= xTilef; xTile++)
	for (int yTile = yTile0; yTile <= yTilef; yTile++)
	{
	if (xTile == 0 \|\| xTile == MAP_WIDTH - 1 \|\| yTile == 0 \|\| yTile == MAP_HEIGHT - 1)
	{
	switch (direction)
	{
	case DIRECTION_LEFT:
	if (map->isLeftBlocking(xTile, yTile)) return true;
	break;

	case DIRECTION_RIGHT:
	if (map->isRightBlocking(xTile, yTile)) return true;
	break;

	case DIRECTION_TOP:
	if (map->isUpBlocking(xTile, yTile)) return true;
	break;

	case DIRECTION_BOTTOM:
	if (map->isDownBlocking(xTile, yTile)) return true;
	break;
	}
	}
	}

	return false;
	}

	void BatEntity::dying()
	{
	isDying = true;
	SpriteEntity* deadBat = new SpriteEntity(ImageManager::getImageManager()->getImage(IMAGE_CORPSES), x, y, 64, 64);
	deadBat->setZ(OFFSET_Y);
	deadBat->setFrame(FRAME_CORPSE_BAT);
	- deadBat->setType(TYPE_CORPSE);
	+ deadBat->setType(ENTITY_CORPSE);

	for (int i = 0; i < 4; i++) parentGame->generateBlood(x, y, bloodColor);

	drop();
	SoundManager::getSoundManager()->playSound(SOUND_ENNEMY_DYING);
	}
	diff --git a/src/BoltEntity.cpp b/src/BoltEntity.cpp
	index 01d7fb1..545b49b 100644
	--- a/src/BoltEntity.cpp
	+++ b/src/BoltEntity.cpp
	@@ -1,126 +1,126 @@
	#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) : CollidingSpriteEntity (image, x, y, BOLT_WIDTH, BOLT_HEIGHT)
	{
	lifetime = boltLifeTime;
	damages = INITIAL_BOLT_DAMAGES;
	- type = 15;
	+ type = ENTITY_BOLT;
	viscosity = 0.97f;
	frame = 0;
	}

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

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

	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);
	trace->setType(16);

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

	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/ChestEntity.cpp b/src/ChestEntity.cpp
	index 85e3f6a..39fdef1 100644
	--- a/src/ChestEntity.cpp
	+++ b/src/ChestEntity.cpp
	@@ -1,81 +1,81 @@
	#include "ChestEntity.h"
	#include "PlayerEntity.h"
	#include "sfml_game/ImageManager.h"
	#include "sfml_game/SoundManager.h"
	#include "sfml_game/SpriteEntity.h"
	#include "Constants.h"

	ChestEntity::ChestEntity(float x, float y, int chestType, bool isOpen)
	: CollidingSpriteEntity(ImageManager::getImageManager()->getImage(IMAGE_CHEST), x, y, 48, 48)
	{
	- type = 19;
	+ type = ENTITY_CHEST;
	imagesProLine = 2;
	this->isOpen = isOpen;
	this->chestType = chestType;
	frame = chestType * 2 + (isOpen ? 1 : 0);
	}

	bool ChestEntity::getOpened()
	{
	return isOpen;
	}

	int ChestEntity::getChestType()
	{
	return chestType;
	}

	void ChestEntity::animate(float delay)
	{
	CollidingSpriteEntity::animate(delay);
	if (!isOpen) testSpriteCollisions();
	z = y + height/2;
	}

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


	void ChestEntity::readCollidingEntity(CollidingSpriteEntity* entity)
	{
	PlayerEntity* playerEntity = dynamic_cast<PlayerEntity*>(entity);

	if (collideWithEntity(entity))
	{
	if (!isOpen && playerEntity != NULL && !playerEntity->isDead())
	{
	open();
	frame += 1;
	}
	}
	}

	void ChestEntity::open()
	{
	isOpen = true;
	SoundManager::getSoundManager()->playSound(SOUND_CHEST_OPENING);

	if (chestType == CHEST_BASIC)
	{
	for (int i = 0; i < 5; i++)
	{
	ItemEntity* newItem = new ItemEntity(ItemEntity::itemCopperCoin, x, y);
	newItem->setMap(map, TILE_WIDTH, TILE_HEIGHT, OFFSET_X, OFFSET_Y);
	newItem->setVelocity(Vector2D(50.0f + rand()% 150));
	newItem->setViscosity(0.96f);
	}
	}
	else if (chestType == CHEST_FAIRY)
	{
	ItemEntity* newItem = new ItemEntity(ItemEntity::itemFairy, x, y);
	newItem->setMap(map, TILE_WIDTH, TILE_HEIGHT, OFFSET_X, OFFSET_Y);
	newItem->setVelocity(Vector2D(50.0f + rand()% 150));
	newItem->setViscosity(0.96f);
	}
	}

	diff --git a/src/Constants.h b/src/Constants.h
	index 5ccd707..3af66ba 100644
	--- a/src/Constants.h
	+++ b/src/Constants.h
	@@ -1,235 +1,247 @@
	/** This file is part of Ostrich Riders.
	*
	* 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>

	//#define _68X68

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

	const int SCREEN_WIDTH = 970; //1024;
	const int SCREEN_HEIGHT = 720; //768;

	const int TILE_WIDTH = 64;
	const int TILE_HEIGHT = 64;

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

	-const int TYPE_BLOOD = 11;
	-const int TYPE_CORPSE = 12;
	-
	-const int TYPE_ITEM = 19;
	-
	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 = 5;
	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 = 5;
	const float FAIRY_BOLT_VELOCITY = 700.0f;

	// Items
	const int NUMBER_EQUIP_ITEMS = 8;
	enum item_equip {
	EQUIP_ENCHANTER_HAT,
	EQUIP_LEATHER_BOOTS,
	EQUIP_BOOK_DUAL,
	EQUIP_CONCENTRATION_AMULET,
	EQUIP_BOSS_KEY,
	EQUIP_VIBRATION_GLOVES,
	EQUIP_MAHONAGY_STAFF,

	EQUIP_FAIRY
	};

	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;

	+// 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 = 15;
	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 = 10;
	const int GREEN_RAT_DAMAGES = 5;
	const float GREEN_RAT_FADE = 1.0f;

	// Bat
	const float BAT_SPEED = 250.0f;
	const int BAT_HP = 5;
	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 = 10;
	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 = 10;
	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 = 400;
	const int KING_RAT_DAMAGES = 8;

	// EFFECTS
	const float HURTING_DELAY = 0.4f;

	#endif // CONSTANTS_H_INCLUDED
	diff --git a/src/DoorEntity.cpp b/src/DoorEntity.cpp
	index 0df4480..352d73f 100644
	--- a/src/DoorEntity.cpp
	+++ b/src/DoorEntity.cpp
	@@ -1,286 +1,286 @@
	#include "DoorEntity.h"
	#include "Constants.h"
	#include "sfml_game/ImageManager.h"

	DoorEntity::DoorEntity(int direction) : SpriteEntity (ImageManager::getImageManager()->getImage(IMAGE_DOOR))
	{
	this->direction = direction;
	isOpen = true;
	removeCenter();
	width = TILE_WIDTH;
	height = TILE_HEIGHT;
	z = OFFSET_Y;
	- type = 3;
	+ type = ENTITY_DOOR;
	doorType = 0;

	//isOpen = false;
	//timer = DOOR_CLOSE_TIME;
	}


	void DoorEntity::animate(float delay)
	{
	age += delay;

	if (timer > 0.0f) timer -= delay;
	//SpriteEntity::animate(delay);
	}

	void DoorEntity::setOpen(bool open)
	{
	isOpen = open;
	timer = 0.0f;
	}

	void DoorEntity::setDoorType(int doorType)
	{
	this->doorType = doorType;
	}

	void DoorEntity::closeDoor()
	{
	isOpen = false;
	timer = DOOR_CLOSE_TIME;
	}

	void DoorEntity::openDoor()
	{
	isOpen = true;
	timer = DOOR_OPEN_TIME;
	}

	void DoorEntity::render(sf::RenderWindow* app)
	{
	if (!isVisible) return;
	float xl, yl, xr, yr;

	if (direction == 8)
	{
	yl = OFFSET_Y;
	yr = OFFSET_Y;
	if (isOpen)
	{
	if (timer > 0.0f)
	{
	xl = OFFSET_X + (MAP_WIDTH / 2 ) * TILE_WIDTH - TILE_WIDTH / 2
	- 1.2f * ((1.0f - (timer / DOOR_OPEN_TIME)) * TILE_WIDTH / 2);
	xr = OFFSET_X + (MAP_WIDTH / 2 ) * TILE_WIDTH + TILE_WIDTH / 2
	+ 1.2f * ((1.0f - (timer / DOOR_OPEN_TIME)) * TILE_WIDTH / 2);
	}
	else
	{
	xl = OFFSET_X + (MAP_WIDTH / 2 ) * TILE_WIDTH - TILE_WIDTH * 1.2f;
	xr = OFFSET_X + (MAP_WIDTH / 2 ) * TILE_WIDTH + TILE_WIDTH * 1.2f;
	}
	}
	else
	{
	if (timer > 0.0f)
	{
	xl = OFFSET_X + (MAP_WIDTH / 2 ) * TILE_WIDTH - TILE_WIDTH / 2
	- 1.2f * ((timer / DOOR_OPEN_TIME) * TILE_WIDTH / 2);
	xr = OFFSET_X + (MAP_WIDTH / 2 ) * TILE_WIDTH + TILE_WIDTH / 2
	+ 1.2f * ((timer / DOOR_OPEN_TIME) * TILE_WIDTH / 2);
	}
	else
	{
	xl = OFFSET_X + (MAP_WIDTH / 2 ) * TILE_WIDTH - TILE_WIDTH /2;;
	xr = OFFSET_X + (MAP_WIDTH / 2 ) * TILE_WIDTH + TILE_WIDTH /2;
	}
	}

	// back
	sprite.setTextureRect(sf::IntRect(3 * width, doorType * height, width * 3, height));
	sprite.setPosition(OFFSET_X + (MAP_WIDTH / 2 - 1) * TILE_WIDTH, OFFSET_Y);
	app->draw(sprite);

	// door
	sprite.setTextureRect(sf::IntRect(0.5f * width, doorType * height, width, height));
	sprite.setPosition(xl, yl);
	app->draw(sprite);

	sprite.setTextureRect(sf::IntRect(1.5f * width, doorType * height, width, height));
	sprite.setPosition(xr, yr);
	app->draw(sprite);

	// front
	sprite.setTextureRect(sf::IntRect(6 * width, doorType * height, width * 3, height));
	sprite.setPosition(OFFSET_X + (MAP_WIDTH / 2 - 1) * TILE_WIDTH, OFFSET_Y);
	app->draw(sprite);
	}

	if (direction == 4)
	{
	xl = OFFSET_X;
	xr = OFFSET_X;
	if (isOpen)
	{
	if (timer > 0.0f)
	{
	yl = OFFSET_Y + (MAP_HEIGHT / 2 ) * TILE_HEIGHT - TILE_HEIGHT / 2
	- 1.2f * ((1.0f - (timer / DOOR_OPEN_TIME)) * TILE_HEIGHT / 2);
	yr = OFFSET_Y + (MAP_HEIGHT / 2 ) * TILE_HEIGHT + TILE_HEIGHT / 2
	+ 1.2f * ((1.0f - (timer / DOOR_OPEN_TIME)) * TILE_HEIGHT / 2);
	}
	else
	{
	yl = OFFSET_Y + (MAP_HEIGHT / 2 ) * TILE_HEIGHT - TILE_HEIGHT * 1.2f;
	yr = OFFSET_Y + (MAP_HEIGHT / 2 ) * TILE_HEIGHT + TILE_HEIGHT * 1.2f;
	}
	}
	else
	{

	if (timer > 0.0f)
	{
	yl = OFFSET_Y + (MAP_HEIGHT / 2 ) * TILE_HEIGHT - TILE_HEIGHT / 2
	- 1.2f * ((timer / DOOR_OPEN_TIME) * TILE_HEIGHT / 2);
	yr = OFFSET_Y + (MAP_HEIGHT / 2 ) * TILE_HEIGHT + TILE_HEIGHT / 2
	+ 1.2f * ((timer / DOOR_OPEN_TIME) * TILE_HEIGHT / 2);
	}
	else
	{
	yl = OFFSET_Y + (MAP_HEIGHT / 2 ) * TILE_HEIGHT - TILE_HEIGHT /2;
	yr = OFFSET_Y + (MAP_HEIGHT / 2 ) * TILE_HEIGHT + TILE_HEIGHT /2;
	}
	}

	// back
	sprite.setTextureRect(sf::IntRect(width + (3 * width * doorType), 2 * height, width , height* 3));
	sprite.setPosition(OFFSET_X + (MAP_WIDTH / 2 - 1) * TILE_WIDTH, OFFSET_Y);
	sprite.setPosition(OFFSET_X, + (MAP_HEIGHT / 2 - 1) * TILE_HEIGHT + OFFSET_Y);
	app->draw(sprite);


	// door
	sprite.setTextureRect(sf::IntRect( 3 * width * doorType, 2.5 * height, width, height));
	sprite.setPosition(xl, yl);
	app->draw(sprite);

	sprite.setTextureRect(sf::IntRect( 3 * width * doorType, 3.5 * height, width, height));
	sprite.setPosition(xr, yr);
	app->draw(sprite);

	// front
	sprite.setTextureRect(sf::IntRect(2 * width + (3 * width * doorType), 2 * height, width , height* 3));
	sprite.setPosition(OFFSET_X + (MAP_WIDTH / 2 - 1) * TILE_WIDTH, OFFSET_Y);
	sprite.setPosition(OFFSET_X, + (MAP_HEIGHT / 2 - 1) * TILE_HEIGHT + OFFSET_Y);
	app->draw(sprite);
	}

	if (direction == 2)
	{
	sprite.setRotation(0.0f);

	yl = OFFSET_Y + TILE_HEIGHT * (MAP_HEIGHT - 1);
	yr = OFFSET_Y + TILE_HEIGHT * (MAP_HEIGHT - 1);
	if (isOpen)
	{
	if (timer > 0.0f)
	{
	xl = OFFSET_X + (MAP_WIDTH / 2 ) * TILE_WIDTH - TILE_WIDTH / 2
	- 1.2f * ((1.0f - (timer / DOOR_OPEN_TIME)) * TILE_WIDTH / 2);
	xr = OFFSET_X + (MAP_WIDTH / 2 ) * TILE_WIDTH + TILE_WIDTH / 2
	+ 1.2f * ((1.0f - (timer / DOOR_OPEN_TIME)) * TILE_WIDTH / 2);
	}
	else
	{
	xl = OFFSET_X + (MAP_WIDTH / 2 ) * TILE_WIDTH - TILE_WIDTH * 1.2f;
	xr = OFFSET_X + (MAP_WIDTH / 2 ) * TILE_WIDTH + TILE_WIDTH * 1.2f;
	}
	}
	else
	{
	if (timer > 0.0f)
	{
	xl = OFFSET_X + (MAP_WIDTH / 2 ) * TILE_WIDTH - TILE_WIDTH / 2
	- 1.2f * ((timer / DOOR_OPEN_TIME) * TILE_WIDTH / 2);
	xr = OFFSET_X + (MAP_WIDTH / 2 ) * TILE_WIDTH + TILE_WIDTH / 2
	+ 1.2f * ((timer / DOOR_OPEN_TIME) * TILE_WIDTH / 2);
	}
	else
	{
	xl = OFFSET_X + (MAP_WIDTH / 2 ) * TILE_WIDTH - TILE_WIDTH /2;;
	xr = OFFSET_X + (MAP_WIDTH / 2 ) * TILE_WIDTH + TILE_WIDTH /2;
	}
	}

	// back
	sprite.setTextureRect(sf::IntRect(3 * width, (1 + doorType) * height, width * 3, -height));
	sprite.setPosition(OFFSET_X + (MAP_WIDTH / 2 - 1) * TILE_WIDTH, yl);
	app->draw(sprite);

	// door
	sprite.setTextureRect(sf::IntRect(0.5f * width, (1 + doorType) * height, width, -height));
	sprite.setPosition(xl, yl);
	app->draw(sprite);

	sprite.setTextureRect(sf::IntRect(1.5f * width, (1 + doorType) * height, width, -height));
	sprite.setPosition(xr, yr);
	app->draw(sprite);

	// front
	sprite.setTextureRect(sf::IntRect(6 * width, (1 + doorType) * height, width * 3, -height));
	sprite.setPosition(OFFSET_X + (MAP_WIDTH / 2 - 1) * TILE_WIDTH, yl);
	//sprite.setRotation(angle);
	app->draw(sprite);
	}

	if (direction == 6)
	{
	xl = OFFSET_X + TILE_WIDTH * (MAP_WIDTH - 1);
	xr = OFFSET_X + TILE_WIDTH * (MAP_WIDTH - 1);
	if (isOpen)
	{
	if (timer > 0.0f)
	{
	yl = OFFSET_Y + (MAP_HEIGHT / 2 ) * TILE_HEIGHT - TILE_HEIGHT / 2
	- 1.2f * ((1.0f - (timer / DOOR_OPEN_TIME)) * TILE_HEIGHT / 2);
	yr = OFFSET_Y + (MAP_HEIGHT / 2 ) * TILE_HEIGHT + TILE_HEIGHT / 2
	+ 1.2f * ((1.0f - (timer / DOOR_OPEN_TIME)) * TILE_HEIGHT / 2);
	}
	else
	{
	yl = OFFSET_Y + (MAP_HEIGHT / 2 ) * TILE_HEIGHT - TILE_HEIGHT * 1.2f;
	yr = OFFSET_Y + (MAP_HEIGHT / 2 ) * TILE_HEIGHT + TILE_HEIGHT * 1.2f;
	}
	}
	else
	{
	if (timer > 0.0f)
	{
	yl = OFFSET_Y + (MAP_HEIGHT / 2 ) * TILE_HEIGHT - TILE_HEIGHT / 2
	- 1.2f * ((timer / DOOR_OPEN_TIME) * TILE_HEIGHT / 2);
	yr = OFFSET_Y + (MAP_HEIGHT / 2 ) * TILE_HEIGHT + TILE_HEIGHT / 2
	+ 1.2f * ((timer / DOOR_OPEN_TIME) * TILE_HEIGHT / 2);
	}
	else
	{
	yl = OFFSET_Y + (MAP_HEIGHT / 2 ) * TILE_HEIGHT - TILE_HEIGHT /2;
	yr = OFFSET_Y + (MAP_HEIGHT / 2 ) * TILE_HEIGHT + TILE_HEIGHT /2;
	}
	}

	// back
	sprite.setTextureRect(sf::IntRect(width * 2 + (3 * width * doorType), 2 * height, -width , height* 3));
	sprite.setPosition(xl + (MAP_WIDTH / 2 - 1) * TILE_WIDTH, OFFSET_Y);
	sprite.setPosition(xl, + (MAP_HEIGHT / 2 - 1) * TILE_HEIGHT + OFFSET_Y);
	app->draw(sprite);


	// door
	sprite.setTextureRect(sf::IntRect(1 * width + (3 * width * doorType), 2.5 * height, -width, height));
	sprite.setPosition(xl, yl);
	app->draw(sprite);

	sprite.setTextureRect(sf::IntRect(1* width + (3 * width * doorType), 3.5 * height, -width, height));
	sprite.setPosition(xr, yr);
	app->draw(sprite);

	// front
	sprite.setTextureRect(sf::IntRect(3 * width + (3 * width * doorType), 2 * height, -width , height* 3));
	sprite.setPosition(xl + (MAP_WIDTH / 2 - 1) * TILE_WIDTH, OFFSET_Y);
	sprite.setPosition(xl, + (MAP_HEIGHT / 2 - 1) * TILE_HEIGHT + OFFSET_Y);
	app->draw(sprite);
	}
	}
	diff --git a/src/DungeonMap.cpp b/src/DungeonMap.cpp
	index 8371ad5..3af7537 100644
	--- a/src/DungeonMap.cpp
	+++ b/src/DungeonMap.cpp
	@@ -1,464 +1,464 @@
	#include "DungeonMap.h"
	#include "GameFloor.h"
	#include "ItemEntity.h"
	#include "ChestEntity.h"
	#include "sfml_game/ImageManager.h"
	#include <cstdlib>
	#include <stdio.h>
	#include <iostream>

	DungeonMap::DungeonMap(int width, int height) : GameMap(width, height)
	{

	}

	DungeonMap::DungeonMap(GameFloor* gameFloor, int x, int y) : GameMap(MAP_WIDTH, MAP_HEIGHT)
	{
	this->gameFloor = gameFloor;
	this->x = x;
	this->y = y;
	cleared = false;
	visited = false;
	known = false;
	}

	DungeonMap::~DungeonMap()
	{
	//dtor
	}

	bool DungeonMap::isVisited()
	{
	return visited;
	}

	void DungeonMap::setVisited(bool b)
	{
	visited = b;
	}

	bool DungeonMap::isKnown()
	{
	return known;
	}

	void DungeonMap::setKnown(bool b)
	{
	known = b;
	}

	bool DungeonMap::isCleared()
	{
	return cleared;
	}

	void DungeonMap::setCleared(bool b)
	{
	cleared = b;
	}

	roomTypeEnum DungeonMap::getRoomType()
	{
	return roomType;
	}

	void DungeonMap::setRoomType(roomTypeEnum roomType)
	{
	this->roomType = roomType;
	}

	void DungeonMap::displayToConsole()
	{
	for (int j=0; j < MAP_HEIGHT; j++)
	{
	for (int i=0; i < MAP_WIDTH; i++)
	{
	printf("%d", map[i][j]);
	}
	printf("\n");
	}
	printf("\n");
	}

	bool DungeonMap::isDownBlocking(int x, int y)
	{
	if (!inMap(x, y)) return false;
	if (map[x][y] >= MAP_WALL) return true;
	return false;
	}

	bool DungeonMap::isUpBlocking(int x, int y)
	{
	if (!inMap(x, y)) return false;
	if (map[x][y] >= MAP_WALL) return true;
	return false;
	}

	bool DungeonMap::isLeftBlocking(int x, int y)
	{
	if (!inMap(x, y)) return false;
	if (map[x][y] >= MAP_WALL) return true;
	return false;
	}

	bool DungeonMap::isRightBlocking(int x, int y)
	{
	if (!inMap(x, y)) return false;
	if (map[x][y] >= MAP_WALL) return true;
	return false;
	}

	bool DungeonMap::isWalkable(int x, int y)
	{
	return (map[x][y] < MAP_WALL);
	}

	void DungeonMap::randomize(int n)
	{
	int i, j;
	int x0 = MAP_WIDTH / 2;
	int y0 = MAP_HEIGHT / 2;

	initRoom();

	// bonus
	if (n == 5)
	{
	roomType = roomTypeBonus;
	}
	// others
	else if (n > 0)
	{
	int r = rand() % 4;

	if (r == 0) // corner blocks
	{
	map[1][1] = 4;
	map[1][MAP_HEIGHT -2] = 4;
	map[MAP_WIDTH - 2][1] = 4;
	map[MAP_WIDTH - 2][MAP_HEIGHT -2] = 4;
	}

	else if (r == 1) // bloc in the middle
	{
	for (i = x0-1; i <= x0+1; i++)
	for (j = y0-1; j <= y0+1; j++)
	map[i][j] = 4;
	}

	else if (r == 2) // checker
	{
	for (i = 2; i < MAP_WIDTH - 2; i = i + 2)
	for (j = 2; j < MAP_HEIGHT - 2; j = j + 2)
	map[i][j] = 4;
	}

	cleared = false;
	roomType = (roomTypeEnum)(rand() % 3);
	}
	else
	{
	cleared = true;
	}
	}

	int DungeonMap::hasNeighbourLeft()
	{
	if (x > 0 && gameFloor->getRoom(x-1, y) > 0)
	{
	if (gameFloor->getRoom(x-1, y) == roomTypeBoss) return 2;
	else return 1;
	}
	return 0;
	}
	int DungeonMap::hasNeighbourRight()
	{
	if (x < MAP_WIDTH -1 && gameFloor->getRoom(x+1, y) > 0)
	{
	if (gameFloor->getRoom(x+1, y) == roomTypeBoss) return 2;
	else return 1;
	}
	return 0;
	}
	int DungeonMap::hasNeighbourUp()
	{
	if (y > 0 && gameFloor->getRoom(x, y-1) > 0)
	{
	if (gameFloor->getRoom(x, y-1) == roomTypeBoss) return 2;
	else return 1;
	}
	return 0;
	}
	int DungeonMap::hasNeighbourDown()
	{
	if (y < MAP_HEIGHT -1 && gameFloor->getRoom(x, y+1) > 0)
	{
	if (gameFloor->getRoom(x, y+1) == roomTypeBoss) return 2;
	else return 1;
	}
	return 0;
	}

	void DungeonMap::initRoom()
	{
	int x0 = MAP_WIDTH / 2;
	int y0 = MAP_HEIGHT / 2;
	int i, j;

	map[0][0] = MAP_WALL_7;
	for ( i = 1 ; i < width -1 ; i++)
	{
	map[i][0] = MAP_WALL_8;
	map[i][height - 1] = MAP_WALL_2;
	}
	map[width - 1][0] = MAP_WALL_9;
	for ( int i = 1 ; i < height -1 ; i++)
	{
	map[0][i] = MAP_WALL_4;
	map[width - 1][i] = MAP_WALL_6;
	}
	map[0][height - 1] = MAP_WALL_1;
	map[width - 1][height - 1] = MAP_WALL_3;



	for ( i = 1 ; i < width - 1 ; i++)
	for ( j = 1 ; j < height - 1 ; j++)
	{
	map[i][j] = 0;
	if (rand()%8 == 0) map[i][j] = rand()%(MAP_NORMAL_FLOOR + 1);
	}

	if (gameFloor != NULL)
	{

	if (x > 0 && gameFloor->getRoom(x-1, y) > 0)
	{
	//map[0][y0-1] = 0;
	map[0][y0] = 0;
	//map[0][y0+1] = 0;
	}
	if (x < MAP_WIDTH -1 && gameFloor->getRoom(x+1, y) > 0)
	{
	//map[MAP_WIDTH -1][y0-1] = 0;
	map[MAP_WIDTH -1][y0] = 0;
	//map[MAP_WIDTH -1][y0+1] = 0;
	}
	if (y > 0 && gameFloor->getRoom(x, y-1) > 0)
	{
	//map[x0-1][0] = 0;
	map[x0][0] = 0;
	//map[x0+1][0] = 0;
	}
	if (y < MAP_HEIGHT -1 && gameFloor->getRoom(x, y+1) > 0)
	{
	//map[x0-1][MAP_HEIGHT -1] = 0;
	map[x0][MAP_HEIGHT -1] = 0;
	//map[x0+1][MAP_HEIGHT -1] = 0;
	}
	}
	}

	Vector2D DungeonMap::generateBonusRoom()
	{
	initRoom();
	int x0 = MAP_WIDTH / 2;
	int y0 = MAP_HEIGHT / 2;

	map[x0 - 1][y0 - 1] = MAP_WALL;
	map[x0 - 1][y0 + 1] = MAP_WALL;
	map[x0 + 1][y0 - 1] = MAP_WALL;
	map[x0 + 1][y0 + 1] = MAP_WALL;

	return (Vector2D(OFFSET_X + x0 * TILE_WIDTH + TILE_WIDTH / 2, OFFSET_Y + y0 * TILE_HEIGHT + TILE_HEIGHT / 2));
	}

	void DungeonMap::generateCarpet(int x0, int y0, int w, int h, int n)
	{
	int xf = x0 + w - 1;
	int yf = y0 + h - 1;

	map[x0][y0] = n;
	map[x0][yf] = n + 6;
	map[xf][y0] = n + 2;
	map[xf][yf] = n + 8;

	int i, j;
	for (i = x0 + 1; i <= xf - 1; i++)
	{
	map[i][y0] = n + 1;
	map[i][yf] = n + 7;
	for (j = y0 + 1; j <= yf - 1; j++)
	map[i][j] = n + 4;
	}

	for (j = y0 + 1; j <= yf - 1; j++)
	{
	map[x0][j] = n + 3;
	map[xf][j] = n + 5;
	}
	}

	Vector2D DungeonMap::generateMerchantRoom()
	{
	initRoom();
	int x0 = 3;
	int y0 = 3;

	generateCarpet(3, 3, 9, 3, 20);


	return (Vector2D(OFFSET_X + x0 * TILE_WIDTH + TILE_WIDTH / 2, OFFSET_Y + y0 * TILE_HEIGHT + TILE_HEIGHT / 2));
	}

	Vector2D DungeonMap::generateKeyRoom()
	{
	initRoom();
	int x0 = MAP_WIDTH / 2;
	int y0 = MAP_HEIGHT / 2;

	for (int i = x0 - 1; i <= x0 + 1; i++)
	for (int j = y0 - 1; j <= y0 + 1; j++)
	map[i][j] = MAP_WALL;

	map[x0][y0] = 0;
	map[x0][y0+1] = MAP_DOOR;

	return (Vector2D(OFFSET_X + x0 * TILE_WIDTH + TILE_WIDTH / 2, OFFSET_Y + y0 * TILE_HEIGHT + TILE_HEIGHT / 2));
	}

	void DungeonMap::generateRoom(int type)
	{
	initRoom();
	int x0 = MAP_WIDTH / 2;
	int y0 = MAP_HEIGHT / 2;
	int i, j, r;

	if (type == 0)
	{
	if (roomType == roomTypeStarting)
	generateCarpet(5, 3, 5, 3, 30);
	}
	if (type == 1)
	{
	// corner block
	map[1][1] = MAP_WALL;
	map[1][MAP_HEIGHT -2] = MAP_WALL;
	map[MAP_WIDTH - 2][1] = MAP_WALL;
	map[MAP_WIDTH - 2][MAP_HEIGHT -2] = MAP_WALL;
	}
	if (type == 2)
	{
	r = 1 + rand() % 3;
	for (i = x0 - r; i <= x0 + r; i++)
	for (j = y0 - 1; j <= y0 + 1; j++)
	map[i][j] = MAP_WALL;
	}
	}

	void DungeonMap::addItem(int itemType, float x, float y, bool merch)
	{
	itemListElement ilm;
	ilm.type = itemType;
	ilm.x = x;
	ilm.y = y;
	ilm.merch = merch;
	itemList.push_back(ilm);
	}

	void DungeonMap::addSprite(int spriteType, int frame, float x, float y, float scale)
	{
	spriteListElement slm;
	slm.type = spriteType;
	slm.frame = frame;
	slm.x = x;
	slm.y = y;
	slm.scale = scale;
	spriteList.push_back(slm);
	}

	void DungeonMap::addChest(int chestType, bool state, float x, float y)
	{
	chestListElement clm;
	clm.type = chestType;
	clm.state = state;
	clm.x = x;
	clm.y = y;
	chestList.push_back(clm);
	}

	void DungeonMap::restoreItems()
	{
	ItemList::iterator it;
	for (it = itemList.begin (); it != itemList.end ();)
	{
	itemListElement ilm = *it;
	it++;
	-
	+
	ItemEntity* itemEntity = new ItemEntity((ItemEntity::enumItemType)(ilm.type), ilm.x, ilm.y);
	itemEntity->setMap(this, TILE_WIDTH, TILE_HEIGHT, OFFSET_X, OFFSET_Y);
	itemEntity->setMerchandise(ilm.merch);
	}
	itemList.clear();
	}

	void DungeonMap::restoreSprites()
	{
	SpriteList::iterator it;
	-
	+
	for (it = spriteList.begin (); it != spriteList.end ();)
	{
	spriteListElement ilm = *it;
	it++;
	-
	- if (ilm.type == TYPE_BLOOD)
	+
	+ if (ilm.type == ENTITY_BLOOD)
	{
	SpriteEntity* blood = new SpriteEntity(ImageManager::getImageManager()->getImage(IMAGE_BLOOD), ilm.x, ilm.y, 16, 16, 6);
	blood->setZ(OFFSET_Y - 1);
	blood->setFrame(ilm.frame);
	- blood->setType(TYPE_BLOOD);
	+ blood->setType(ENTITY_BLOOD);
	blood->setScale(ilm.scale, ilm.scale);
	}
	- else if (ilm.type == TYPE_CORPSE)
	+ else if (ilm.type == ENTITY_CORPSE)
	{
	SpriteEntity* corpse;
	-
	+
	if (ilm.frame >= FRAME_CORPSE_KING_RAT)
	{
	corpse = new SpriteEntity(ImageManager::getImageManager()->getImage(IMAGE_CORPSES_BIG), ilm.x, ilm.y, 128, 128);
	corpse->setFrame(ilm.frame - FRAME_CORPSE_KING_RAT);
	}
	else
	{
	corpse = new SpriteEntity(ImageManager::getImageManager()->getImage(IMAGE_CORPSES), ilm.x, ilm.y, 64, 64);
	corpse->setFrame(ilm.frame);
	}
	-
	+
	corpse->setZ(OFFSET_Y);
	- corpse->setType(TYPE_CORPSE);
	+ corpse->setType(ENTITY_CORPSE);
	}
	}
	spriteList.clear();
	}

	void DungeonMap::restoreChests()
	{
	ChestList::iterator it;
	-
	+
	for (it = chestList.begin (); it != chestList.end ();)
	{
	chestListElement clm = *it;
	it++;
	-
	+
	ChestEntity* chestEntity = new ChestEntity(clm.x, clm.y, clm.type, clm.state);
	chestEntity->setMap(this, TILE_WIDTH, TILE_HEIGHT, OFFSET_X, OFFSET_Y);
	}
	chestList.clear();
	}

	void DungeonMap::restoreMapObjects()
	{
	restoreItems();
	restoreSprites();
	restoreChests();
	}
	diff --git a/src/EnnemyBoltEntity.cpp b/src/EnnemyBoltEntity.cpp
	index 4615847..bacb5c1 100644
	--- a/src/EnnemyBoltEntity.cpp
	+++ b/src/EnnemyBoltEntity.cpp
	@@ -1,114 +1,112 @@
	#include "EnnemyBoltEntity.h"
	#include "Constants.h"
	#include "sfml_game/ImageManager.h"

	EnnemyBoltEntity::EnnemyBoltEntity(sf::Texture* image, float x = 0.0f, float y = 0.0f) : CollidingSpriteEntity (image, x, y, BOLT_WIDTH, BOLT_HEIGHT)
	{
	- //lifetime = INITIAL_BOLT_LIFE;
	damages = INITIAL_BOLT_DAMAGES;
	- type = 19;
	- //viscosity = 0.97f;
	+ type = ENTITY_ENNEMY_BOLT;
	frame = 1;
	}

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

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

	void EnnemyBoltEntity::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);
	trace->setFrame(frame);
	trace->setType(16);

	z = y + height;
	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)));
	}
	}

	void EnnemyBoltEntity::collide()
	{
	isDying = true;
	}

	void EnnemyBoltEntity::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->setFrame(frame);
	trace->setType(16);
	}

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

	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 EnnemyBoltEntity::collideMapLeft()
	{
	velocity.x = 0.0f;
	isDying = true;

	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 EnnemyBoltEntity::collideMapTop()
	{
	velocity.y = 0.0f;
	isDying = true;

	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 EnnemyBoltEntity::collideMapBottom()
	{
	velocity.y = 0.0f;
	isDying = true;

	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/EnnemyEntity.cpp b/src/EnnemyEntity.cpp
	index 8c9e2fa..49b83af 100644
	--- a/src/EnnemyEntity.cpp
	+++ b/src/EnnemyEntity.cpp
	@@ -1,111 +1,112 @@
	#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, GameMap* map)
	: BaseCreatureEntity (image, x, y, 64, 64)
	{
	- type = 21;
	+ type = ENTITY_ENNEMY;
	bloodColor = bloodRed;
	setMap(map, TILE_WIDTH, TILE_HEIGHT, OFFSET_X, OFFSET_Y);

	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 (collideWithEntity(entity))
	+ if (playerEntity != NULL && !playerEntity->isDead())
	+ playerEntity->hurt(meleeDamages);
	+ else if (boltEntity != NULL && !boltEntity->getDying() && boltEntity->getAge() > 0.05f)
	{
	- if (playerEntity != NULL && !playerEntity->isDead())
	- playerEntity->hurt(meleeDamages);
	- else if (boltEntity != NULL && !boltEntity->getDying() && boltEntity->getAge() > 0.05f)
	- {
	- boltEntity->collide();
	- hurt(boltEntity->getDamages());
	- parentGame->generateBlood(x, y, bloodColor);
	- SoundManager::getSoundManager()->playSound(SOUND_IMPACT);
	+ boltEntity->collide();
	+ hurt(boltEntity->getDamages());
	+ parentGame->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);
	- }
	+ 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(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/EvilFlowerEntity.cpp b/src/EvilFlowerEntity.cpp
	index 027cfc9..4e62357 100644
	--- a/src/EvilFlowerEntity.cpp
	+++ b/src/EvilFlowerEntity.cpp
	@@ -1,106 +1,106 @@
	#include "EvilFlowerEntity.h"
	#include "BoltEntity.h"
	#include "EnnemyBoltEntity.h"
	#include "PlayerEntity.h"
	#include "sfml_game/SpriteEntity.h"
	#include "sfml_game/ImageManager.h"
	#include "sfml_game/SoundManager.h"
	#include "Constants.h"
	#include "WitchBlastGame.h"
	#include <math.h>

	EvilFlowerEntity::EvilFlowerEntity(float x, float y, GameMap* map, PlayerEntity* player)
	: EnnemyEntity (ImageManager::getImageManager()->getImage(IMAGE_FLOWER), x, y, map)
	{
	hp = EVIL_FLOWER_HP;
	meleeDamages = EVIL_FLOWER_MELEE_DAMAGES;

	setSpin(50.0f);
	frame = 0;

	type = 23;
	bloodColor = bloodGreen;
	//shadowFrame = 2;

	fireDelay = EVIL_FLOWER_FIRE_DELAY;
	this->player = player;
	age = -1.0f + (rand() % 2500) * 0.001f;
	}

	void EvilFlowerEntity::animate(float delay)
	{
	if (fireDelay < 0.7f) setSpin(500.0f);
	else if (fireDelay < 1.4f) setSpin(120.0f);
	else setSpin(50.0f);

	EnnemyEntity::animate(delay);
	angle += spin * delay;

	if (age > 0.0f)
	{
	fireDelay -= delay;
	if (fireDelay <= 0.0f)
	{
	fireDelay = EVIL_FLOWER_FIRE_DELAY;
	fire();
	}
	}
	}

	void EvilFlowerEntity::calculateBB()
	{
	boundingBox.left = (int)x - width / 2 + EVIL_FLOWER_BB_LEFT;
	boundingBox.width = width - EVIL_FLOWER_BB_WIDTH_DIFF;
	boundingBox.top = (int)y - height / 2 + EVIL_FLOWER_BB_TOP;
	boundingBox.height = height - EVIL_FLOWER_BB_HEIGHT_DIFF;
	}

	void EvilFlowerEntity::dying()
	{
	isDying = true;
	SpriteEntity* deadFlower = new SpriteEntity(ImageManager::getImageManager()->getImage(IMAGE_CORPSES), x, y, 64, 64);
	deadFlower->setZ(OFFSET_Y);
	deadFlower->setFrame(FRAME_CORPSE_FLOWER);
	- deadFlower->setType(TYPE_CORPSE);
	+ deadFlower->setType(ENTITY_CORPSE);

	for (int i = 0; i < 4; i++) parentGame->generateBlood(x, y, bloodColor);
	drop();
	SoundManager::getSoundManager()->playSound(SOUND_ENNEMY_DYING);
	}

	void EvilFlowerEntity::fire()
	{
	SoundManager::getSoundManager()->playSound(SOUND_BLAST_FLOWER);
	EnnemyBoltEntity* bolt = new EnnemyBoltEntity
	(ImageManager::getImageManager()->getImage(IMAGE_BOLT), x, y + 10);
	bolt->setFrame(1);
	bolt->setMap(map, TILE_WIDTH, TILE_HEIGHT, OFFSET_X, OFFSET_Y);

	bolt->setVelocity(Vector2D(200.0f, 0.0f));

	float tan = (player->getX() - x) / (player->getY() - y);
	float angle = atan(tan);

	if (player->getY() > y)
	bolt->setVelocity(Vector2D(sin(angle) * EVIL_FLOWER_FIRE_VELOCITY,
	cos(angle) * EVIL_FLOWER_FIRE_VELOCITY));
	else
	bolt->setVelocity(Vector2D(-sin(angle) * EVIL_FLOWER_FIRE_VELOCITY,
	-cos(angle) * EVIL_FLOWER_FIRE_VELOCITY));
	}

	void EvilFlowerEntity::render(sf::RenderWindow* app)
	{
	sprite.setPosition(x, y);
	float savedAngle = sprite.getRotation();
	sprite.setRotation(0.0f);

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

	sprite.setRotation(savedAngle);
	EnnemyEntity::render(app);
	}
	diff --git a/src/FairyEntity.cpp b/src/FairyEntity.cpp
	index 5c8bf33..258e710 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 = 2;
	+ 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);
	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/GreenRatEntity.cpp b/src/GreenRatEntity.cpp
	index 867bf39..4f5be2a 100644
	--- a/src/GreenRatEntity.cpp
	+++ b/src/GreenRatEntity.cpp
	@@ -1,100 +1,100 @@
	#include "GreenRatEntity.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 "WitchBlastGame.h"

	GreenRatEntity::GreenRatEntity(float x, float y, GameMap* map, PlayerEntity* player)
	: EnnemyEntity (ImageManager::getImageManager()->getImage(IMAGE_RAT), x, y, map)
	{
	imagesProLine = 4;
	creatureSpeed = GREEN_RAT_SPEED;
	velocity = Vector2D(creatureSpeed);
	hp = GREEN_RAT_HP;
	meleeDamages = GREEN_RAT_DAMAGES;

	- type = 21;
	+ type = ENTITY_ENNEMY_INVOCATED;
	bloodColor = bloodRed;
	shadowFrame = 3;

	timer = (rand() % 50) / 10.0f;
	age = -GREEN_RAT_FADE;
	frame = 4;
	this->player = player;
	}

	void GreenRatEntity::animate(float delay)
	{
	z = y + boundingBox.top + boundingBox.height;

	if (age > 0.0f)
	{
	sprite.setColor(sf::Color(255,255,255,255));
	frame = 4 + ((int)(age * 5.0f)) % 2;
	timer = timer - delay;
	if (timer <= 0.0f)
	{
	timer = (rand() % 50) / 10.0f;
	float tan = (player->getX() - x) / (player->getY() - y);
	float angle = atan(tan);

	if (player->getY() > y)
	setVelocity(Vector2D(sin(angle) * RAT_SPEED,
	cos(angle) * RAT_SPEED));
	else
	setVelocity(Vector2D(-sin(angle) * RAT_SPEED,
	-cos(angle) * RAT_SPEED));
	}
	}
	else
	{
	sprite.setColor(sf::Color(255,255,255,255 * (1.0 + age)));
	}

	EnnemyEntity::animate(delay);
	}

	void GreenRatEntity::calculateBB()
	{
	boundingBox.left = (int)x - width / 2 + RAT_BB_LEFT;
	boundingBox.width = width - RAT_BB_WIDTH_DIFF;
	boundingBox.top = (int)y - height / 2 + RAT_BB_TOP;
	boundingBox.height = height - RAT_BB_HEIGHT_DIFF;
	}

	void GreenRatEntity::collideMapRight()
	{
	velocity.x = -velocity.x;
	}

	void GreenRatEntity::collideMapLeft()
	{
	velocity.x = -velocity.x;
	}

	void GreenRatEntity::collideMapTop()
	{
	velocity.y = -velocity.y;
	}

	void GreenRatEntity::collideMapBottom()
	{
	velocity.y = -velocity.y;
	}


	void GreenRatEntity::dying()
	{
	isDying = true;
	SpriteEntity* deadRat = new SpriteEntity(ImageManager::getImageManager()->getImage(IMAGE_CORPSES), x, y, 64, 64);
	deadRat->setZ(OFFSET_Y);
	deadRat->setFrame(FRAME_CORPSE_GREEN_RAT);
	- deadRat->setType(TYPE_CORPSE);
	+ deadRat->setType(ENTITY_CORPSE);

	for (int i = 0; i < 4; i++) parentGame->generateBlood(x, y, bloodColor);
	//drop();
	SoundManager::getSoundManager()->playSound(SOUND_ENNEMY_DYING);
	}
	diff --git a/src/ItemEntity.cpp b/src/ItemEntity.cpp
	index 29ed841..b3bbe3d 100644
	--- a/src/ItemEntity.cpp
	+++ b/src/ItemEntity.cpp
	@@ -1,157 +1,157 @@
	#include "ItemEntity.h"
	#include "sfml_game/ImageManager.h"
	#include "sfml_game/SpriteEntity.h"
	#include "Constants.h"
	#include "MagnetEntity.h"
	#include "WitchBlastGame.h"
	#include "StaticTextEntity.h"
	#include <iostream>
	#include <sstream>

	const int itemCost[12] =
	{
	1, // copper coin
	5, // silver
	20, // gold
	8, // health

	20, // hat
	20, // boots
	20, // dual
	20, // amulet
	100, // boss key
	20, // gloves
	20, // staff

	30, // fairy
	};

	ItemEntity::ItemEntity(enumItemType itemType, float x, float y)
	: CollidingSpriteEntity(ImageManager::getImageManager()->getImage(itemType >= itemMagicianHat ? IMAGE_ITEMS_EQUIP : IMAGE_ITEMS), x, y, ITEM_WIDTH, ITEM_HEIGHT)
	{
	- type = TYPE_ITEM;
	+ type = ENTITY_ITEM;
	this->itemType = itemType;
	frame = itemType;
	if (itemType >= itemMagicianHat) frame = itemType - itemMagicianHat;
	isMerchandise = false;
	}

	void ItemEntity::setMerchandise(bool isMerchandise)
	{
	this->isMerchandise = isMerchandise;
	}
	bool ItemEntity::getMerchandise()
	{
	return isMerchandise;
	}

	int ItemEntity::getPrice()
	{
	return (itemCost[(int)(itemType)]);
	}

	void ItemEntity::setParent(WitchBlastGame* parent)
	{
	parentGame = parent;
	}


	void ItemEntity::animate(float delay)
	{
	z = y + height;
	CollidingSpriteEntity::animate(delay);
	if (age > 0.7f) testSpriteCollisions();
	}

	void ItemEntity::render(sf::RenderWindow* app)
	{
	// shadow
	sprite.setTextureRect(sf::IntRect(9 * width, height, width, height));
	app->draw(sprite);

	// price
	if (isMerchandise)
	{
	std::ostringstream oss;
	oss << getPrice() << " $";
	StaticTextEntity::Write(app, oss.str(), 16, x, y + 18.0f, ALIGN_CENTER, sf::Color(255, 255, 255));
	}

	CollidingSpriteEntity::render(app);
	}

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

	void ItemEntity::dying()
	{
	isDying = true;
	}

	void ItemEntity::readCollidingEntity(CollidingSpriteEntity* entity)
	{
	PlayerEntity* playerEntity = dynamic_cast<PlayerEntity*>(entity);

	if (collideWithEntity(entity))
	{
	if (playerEntity != NULL && !playerEntity->isDead())
	{
	if (isMerchandise == false \|\| playerEntity->getGold() >= getPrice())
	{
	playerEntity->acquireItem(itemType);

	if (isMerchandise) playerEntity->pay(getPrice());

	//isDying = true;
	dying();

	if (itemType >= itemMagicianHat)
	{

	parentGame->showArtefactDescription(itemType);
	SpriteEntity* spriteItem = new SpriteEntity(
	image,
	playerEntity->getX(), playerEntity->getY() - 60.0f, ITEM_WIDTH, ITEM_HEIGHT);
	spriteItem->setFrame(frame);
	spriteItem->setZ(z);
	spriteItem->setLifetime(ACQUIRE_DELAY);

	SpriteEntity* spriteStar = new SpriteEntity(
	ImageManager::getImageManager()->getImage(IMAGE_STAR),
	playerEntity->getX(), playerEntity->getY() - 60.0f);
	spriteStar->setScale(4.0f, 4.0f);
	spriteStar->setZ(z-1.0f);
	spriteStar->setLifetime(ACQUIRE_DELAY);
	spriteStar->setSpin(50.0f);
	}
	else
	new MagnetEntity(x, y, playerEntity, itemType);
	}
	}
	}
	}

	void ItemEntity::collideMapRight()
	{
	velocity.x = -velocity.x * 0.66f;
	}

	void ItemEntity::collideMapLeft()
	{
	velocity.x = -velocity.x * 0.66f;
	}

	void ItemEntity::collideMapTop()
	{
	velocity.y = -velocity.y * 0.66f;
	}

	void ItemEntity::collideMapBottom()
	{
	velocity.y = -velocity.y * 0.66f;
	}
	diff --git a/src/KingRatEntity.cpp b/src/KingRatEntity.cpp
	index adaf508..adad7be 100644
	--- a/src/KingRatEntity.cpp
	+++ b/src/KingRatEntity.cpp
	@@ -1,350 +1,350 @@
	#include "KingRatEntity.h"
	#include "GreenRatEntity.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 "WitchBlastGame.h"
	#include "StaticTextEntity.h"

	#include <iostream>

	KingRatEntity::KingRatEntity(float x, float y, GameMap* map, PlayerEntity* player)
	: EnnemyEntity (ImageManager::getImageManager()->getImage(IMAGE_KING_RAT), x, y, map)
	{
	width = 128;
	height = 128;
	creatureSpeed = KING_RAT_SPEED;
	velocity = Vector2D(creatureSpeed);
	hp = KING_RAT_HP;
	hpDisplay = hp;
	hpMax = KING_RAT_HP;
	meleeDamages = KING_RAT_DAMAGES;

	- type = 21;
	+ type = ENTITY_ENNEMY_BOSS;
	bloodColor = bloodRed;
	shadowFrame = 4;
	frame = 0;
	sprite.setOrigin(64.0f, 64.0f);
	this->player = player;

	state = 0;
	timer = 2.0f + (rand() % 40) / 10.0f;
	age = 0.0f;

	berserkDelay = 1.0f + rand()%5 * 0.1f;

	hasBeenBerserk = false;
	}

	void KingRatEntity::animate(float delay)
	{
	float timerMult = 1.0f;
	if (hp <= hpMax / 4)
	{
	creatureSpeed = KING_RAT_SPEED * 1.4f;
	timerMult = 0.7f;
	}
	else if (hp <= hpMax / 2)
	{
	creatureSpeed = KING_RAT_SPEED * 1.2f;
	timerMult = 0.85f;
	}
	else
	{
	creatureSpeed = KING_RAT_SPEED;
	}

	if (state == 5)
	{
	velocity.x *= 0.965f;
	velocity.y *= 0.965f;
	}

	else
	{
	if (velocity.x > 0.1f) sprite.setScale(-1.0f, 1.0f);
	else if (velocity.x < -0.1f) sprite.setScale(1.0f, 1.0f);
	}


	timer -= delay;

	if (timer <= 0.0f)
	{
	if (state == 0)
	{
	state = 1;
	// generate rats
	generateGreenRats();
	SoundManager::getSoundManager()->playSound(SOUND_KING_RAT_1);
	timer = 2.0f;

	velocity.x = 0.0f;
	velocity.y = 0.0f;
	}

	else if (state == 1) // generate rats
	{
	// to normal or berserk
	if (hp < hpMax / 4 && !hasBeenBerserk)
	{
	hasBeenBerserk = true;
	timer = 12.0f;
	state = 6;
	velocity = Vector2D(KING_RAT_BERSERK_SPEED);
	SoundManager::getSoundManager()->playSound(SOUND_KING_RAT_2);
	}
	else
	{
	timer = 7.0f * timerMult;
	velocity = Vector2D(creatureSpeed);
	state = 2;
	}
	}

	else if (state == 2) // normal -> rush
	{
	state = 3;
	// angry
	timer = 2.0f;

	velocity.x = 0.0f;
	velocity.y = 0.0f;
	SoundManager::getSoundManager()->playSound(SOUND_KING_RAT_2);
	}

	else if (state == 3) // normal -> rush
	{
	state = 4;
	// rush
	timer = 12.0f;

	float tan = (player->getX() - x) / (player->getY() - y);
	float angle = atan(tan);

	if (player->getY() > y)
	setVelocity(Vector2D(sin(angle) * KING_RAT_RUNNING_SPEED,
	cos(angle) * KING_RAT_RUNNING_SPEED));
	else
	setVelocity(Vector2D(-sin(angle) * KING_RAT_RUNNING_SPEED,
	-cos(angle) * KING_RAT_RUNNING_SPEED));
	}
	else if (state == 5) // wall impact
	{
	// to normal or berserk
	if (hp < hpMax / 4 && !hasBeenBerserk)
	{
	hasBeenBerserk = true;
	timer = 12.0f;
	state = 6;
	velocity = Vector2D(KING_RAT_BERSERK_SPEED);
	SoundManager::getSoundManager()->playSound(SOUND_KING_RAT_2);
	}
	else
	{
	timer = 7.0f * timerMult;
	velocity = Vector2D(creatureSpeed);
	state = 0;
	}
	}

	else if (state == 6)
	{
	timer = 7.0f * timerMult;
	velocity = Vector2D(creatureSpeed);
	state = 0;
	}
	}

	if (state == 6)
	{
	berserkDelay -= delay;

	if (berserkDelay <= 0.0f)
	{
	berserkDelay = 0.8f + (rand()%10) / 10.0f;
	SoundManager::getSoundManager()->playSound(SOUND_KING_RAT_2);

	float tan = (player->getX() - x) / (player->getY() - y);
	float angle = atan(tan);

	if (player->getY() > y)
	setVelocity(Vector2D(sin(angle) * KING_RAT_BERSERK_SPEED,
	cos(angle) * KING_RAT_BERSERK_SPEED));
	else
	setVelocity(Vector2D(-sin(angle) * KING_RAT_BERSERK_SPEED,
	-cos(angle) * KING_RAT_BERSERK_SPEED));
	}
	}

	frame = 0;

	if (state == 1)
	frame = 3;
	else if (state == 3 \|\| state == 6)
	{
	frame = 3; //0;
	int r = ((int)(age * 10.0f)) % 2;
	if (r == 0)
	sprite.setScale(-1.0f, 1.0f);
	else
	sprite.setScale(1.0f, 1.0f);
	}
	else if (state == 4)
	{
	int r = ((int)(age * 7.5f)) % 4;
	if (r == 1) frame = 1;
	else if (r == 3) frame = 2;
	}
	else if (state == 5)
	{
	frame = 0;
	}
	else
	{
	int r = ((int)(age * 5.0f)) % 4;
	if (r == 1) frame = 1;
	else if (r == 3) frame = 2;
	}

	EnnemyEntity::animate(delay);
	}

	void KingRatEntity::hurt(int damages)
	{
	hurting = true;
	hurtingDelay = HURTING_DELAY;

	if (state == 6)
	hp -= damages / 4;
	else
	hp -= damages;

	if (hp <= 0)
	{
	hp = 0;
	dying();
	}
	}

	void KingRatEntity::calculateBB()
	{
	boundingBox.left = (int)x - width / 2 + 25;
	boundingBox.width = width - 50;
	boundingBox.top = (int)y - height / 2 + 25;
	boundingBox.height = height - 35;
	}


	void KingRatEntity::afterWallCollide()
	{
	if (state == 4)
	{
	state = 5;
	timer = 1.4f;
	velocity.x *= 0.75f;
	velocity.y *= 0.75f;
	//velocity = Vector2D(creatureSpeed);
	SoundManager::getSoundManager()->playSound(SOUND_BIG_WALL_IMPACT);
	}
	}
	void KingRatEntity::collideMapRight()
	{
	velocity.x = -velocity.x;

	afterWallCollide();
	}

	void KingRatEntity::collideMapLeft()
	{
	velocity.x = -velocity.x;

	afterWallCollide();
	}

	void KingRatEntity::collideMapTop()
	{
	velocity.y = -velocity.y;

	afterWallCollide();
	}

	void KingRatEntity::collideMapBottom()
	{
	velocity.y = -velocity.y;

	afterWallCollide();
	}


	void KingRatEntity::dying()
	{
	isDying = true;
	SpriteEntity* deadRat = new SpriteEntity(ImageManager::getImageManager()->getImage(IMAGE_CORPSES_BIG), x, y, 128, 128);
	deadRat->setZ(OFFSET_Y);
	deadRat->setFrame(FRAME_CORPSE_KING_RAT - FRAME_CORPSE_KING_RAT);
	- deadRat->setType(TYPE_CORPSE);
	+ deadRat->setType(ENTITY_CORPSE);

	for (int i = 0; i < 10; i++) parentGame->generateBlood(x, y, bloodColor);

	SoundManager::getSoundManager()->playSound(SOUND_KING_RAT_DIE);
	}

	void KingRatEntity::generateGreenRats()
	{
	for (int i = 0; i < 5; i++)
	{
	float xr = x + -100 + rand() % 200;
	float yr = y + -100 + rand() % 200;

	if (xr > OFFSET_X + TILE_WIDTH * 1.5f && xr < OFFSET_X + TILE_WIDTH * (MAP_WIDTH - 2)
	&& yr > OFFSET_Y + TILE_HEIGHT * 1.5f && yr < OFFSET_Y + TILE_HEIGHT * (MAP_HEIGHT - 2))
	{
	new GreenRatEntity(xr, yr, map, player);
	}
	else
	i--;
	}
	}

	void KingRatEntity::render(sf::RenderWindow* app)
	{
	EnnemyEntity::render(app);

	if (state == 6)
	{
	int r = ((int)(age *12.0f)) % 2;
	if (r == 0)
	sprite.setTextureRect(sf::IntRect(1 * width, 1 * height, width, height));
	else
	sprite.setTextureRect(sf::IntRect(2 * width, 1 * height, -width, height));

	sprite.setPosition(x, y);
	sprite.setColor(sf::Color(255, 255, 255, 190));
	app->draw(sprite);
	sprite.setColor(sf::Color(255, 255, 255, 255));
	}

	float l = hpDisplay * ((MAP_WIDTH - 1) * TILE_WIDTH) / KING_RAT_HP;

	sf::RectangleShape rectangle(sf::Vector2f((MAP_WIDTH - 1) * TILE_WIDTH, 25));
	rectangle.setFillColor(sf::Color(0, 0, 0,128));
	rectangle.setPosition(sf::Vector2f(OFFSET_X + TILE_WIDTH / 2, OFFSET_Y + 25 + (MAP_HEIGHT - 1) * TILE_HEIGHT));
	app->draw(rectangle);

	rectangle.setSize(sf::Vector2f(l, 25));
	rectangle.setFillColor(sf::Color(190, 20, 20));
	rectangle.setPosition(sf::Vector2f(OFFSET_X + TILE_WIDTH / 2, OFFSET_Y + 25 + (MAP_HEIGHT - 1) * TILE_HEIGHT));
	app->draw(rectangle);

	StaticTextEntity::Write(app,
	"Rat King",
	18,
	OFFSET_X + TILE_WIDTH / 2 + 10.0f,
	OFFSET_Y + 25 + (MAP_HEIGHT - 1) * TILE_HEIGHT + 1.0f,
	ALIGN_LEFT,
	sf::Color(255, 255, 255));
	}
	diff --git a/src/MagnetEntity.cpp b/src/MagnetEntity.cpp
	index 1acf365..1b0d535 100644
	--- a/src/MagnetEntity.cpp
	+++ b/src/MagnetEntity.cpp
	@@ -1,30 +1,31 @@
	#include "MagnetEntity.h"
	#include "Constants.h"
	#include "sfml_game/ImageManager.h"

	MagnetEntity::MagnetEntity(float x, float y, PlayerEntity* parentEntity, ItemEntity::enumItemType itemType) : SpriteEntity (ImageManager::getImageManager()->getImage(IMAGE_ITEMS), x, y, ITEM_WIDTH, ITEM_HEIGHT)
	{
	this->x = x;
	this->y = y;
	this->setLifetime(0.7f);
	//itemFadingEntity->setFading(true);
	this->setShrinking(true);
	this->setVelocity(Vector2D(150.0f - rand()%300, -260.0f));
	this->setWeight(800.0f);
	this->setFrame(itemType);
	this->parentEntity = parentEntity;
	+ type = ENTITY_EFFECT;
	}


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

	if (age > lifetime * 0.3f)
	{
	velocity.x += (parentEntity->getX() - x) * delay * 30.0f;
	velocity.y += (parentEntity->getY() - y) * delay * 30.0f;
	}

	SpriteEntity::animate(delay);
	}
	diff --git a/src/PlayerEntity.cpp b/src/PlayerEntity.cpp
	index 8a90f4c..94d7746 100644
	--- a/src/PlayerEntity.cpp
	+++ b/src/PlayerEntity.cpp
	@@ -1,537 +1,537 @@
	#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(sf::Texture* image, float x = 0.0f, float y = 0.0f) : BaseCreatureEntity (image, x, y, 64, 96)
	{
	currentFireDelay = -1.0f;
	canFirePlayer = true;
	- type = 1;
	+ type = ENTITY_PLAYER;

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

	boltLifeTime = INITIAL_BOLT_LIFE;

	bloodColor = bloodRed;

	for (int i = 0; i < NUMBER_EQUIP_ITEMS; i++) equip[i] = false;
	colliding = 0;

	computePlayer();

	// TEST
	//equip[EQUIP_BOSS_KEY] = true;
	}

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

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

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

	int PlayerEntity::getColliding()
	{
	return colliding;
	}

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

	void PlayerEntity::animate(float delay)
	{
	// 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;

	if (acquiredItem == (int)EQUIP_FAIRY)
	{
	fairy = new FairyEntity(x, y - 50.0f, this);
	}
	}
	}
	else if (playerStatus == playerStatusUnlocking)
	{
	acquireDelay -= delay;
	if (acquireDelay <= 0.0f)
	{
	playerStatus = playerStatusPlaying;
	}
	}
	//z = y;
	if (playerStatus != playerStatusDead) testSpriteCollisions();
	colliding = 0;
	BaseCreatureEntity::animate(delay);

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

	if (x < OFFSET_X)
	parentGame->moveToOtherMap(4);
	else if (x > OFFSET_X + MAP_WIDTH * TILE_WIDTH)
	parentGame->moveToOtherMap(6);
	else if (y < OFFSET_Y)
	parentGame->moveToOtherMap(8);
	else if (y > OFFSET_Y + MAP_HEIGHT * TILE_HEIGHT - 5)
	parentGame->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;
	parentGame->closeDoors();
	}
	}

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


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

	sprite.setPosition(x, y);

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

	// 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_MAHONAGY_STAFF])
	sprite.setTextureRect(sf::IntRect(frame * width + 4, 4 * height, width, height));
	else
	sprite.setTextureRect(sf::IntRect(frame * width + 4, 4 * height, width, height));
	app->draw(sprite);

	// 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
	sprite.setTextureRect(sf::IntRect(width * 1, 4 * 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());
	parentGame->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));
	}
	}

	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::generateBolt(float velx, float vely)
	{
	BoltEntity* bolt = new BoltEntity(ImageManager::getImageManager()->getImage(1), x, y + 20, boltLifeTime);
	bolt->setMap(map, TILE_WIDTH, TILE_HEIGHT, OFFSET_X, OFFSET_Y);
	bolt->setDamages(fireDamages);
	bolt->setVelocity(Vector2D(velx, vely));
	}

	void PlayerEntity::fire(int 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::canFire()
	{
	return canFirePlayer;
	}

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

	void PlayerEntity::hurt(int damages)
	{
	if (!hurting)
	{
	SoundManager::getSoundManager()->playSound(SOUND_PLAYER_HIT);
	BaseCreatureEntity::hurt(damages);
	parentGame->generateBlood(x, y, bloodColor);
	parentGame->generateBlood(x, y, bloodColor);
	}
	}

	void PlayerEntity::loseItem(ItemEntity::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->setType(TYPE_BLOOD);
	+ 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(ItemEntity::itemCopperCoin, false);

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

	for (i = 0; i < 8; i++) parentGame->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(TYPE_BLOOD);
	+ itemSprite->setType(ENTITY_BLOOD);
	itemSprite->setVelocity(Vector2D(rand()%450));
	itemSprite->setViscosity(0.95f);
	itemSprite->setSpin( (rand() % 700) - 350.0f);
	}

	void PlayerEntity::acquireItem(ItemEntity::enumItemType type)
	{
	if (type >= ItemEntity::itemMagicianHat) acquireStance(type);
	else switch (type)
	{
	case ItemEntity::itemCopperCoin: gold++;
	SoundManager::getSoundManager()->playSound(SOUND_COIN_PICK_UP);
	break;
	case ItemEntity::itemSilverCoin: gold = gold + 5; break;
	case ItemEntity::itemGoldCoin: gold = gold + 10; break;
	case ItemEntity::itemHealth: hp += 15;
	SoundManager::getSoundManager()->playSound(SOUND_DRINK);
	if (hp > hpMax) hp = hpMax; break;
	default: break;
	}
	}

	void PlayerEntity::computePlayer()
	{
	fireDelay = INITIAL_PLAYER_FIRE_DELAY;
	creatureSpeed = INITIAL_PLAYER_SPEED;
	fireVelocity = INITIAL_BOLT_VELOCITY;
	fireDamages = INITIAL_BOLT_DAMAGES;

	if (equip[EQUIP_VIBRATION_GLOVES]) fireDelay *= 0.90f;
	if (equip[EQUIP_ENCHANTER_HAT]) fireDelay *= 0.75f;
	if (equip[EQUIP_LEATHER_BOOTS]) creatureSpeed += 50.0f;
	if (equip[EQUIP_BOOK_DUAL]) fireDelay *= 1.6f;
	if (equip[EQUIP_CONCENTRATION_AMULET]) boltLifeTime *= 1.5f;
	if (equip[EQUIP_MAHONAGY_STAFF])
	{
	fireVelocity *= 1.15f;
	fireDamages *= 1.5f;
	}
	}

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

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

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

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

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

	void PlayerEntity::useBossKey()
	{
	velocity.x = 0.0f;
	velocity.y = 0.0f;
	playerStatus = playerStatusUnlocking;
	acquireDelay = UNLOCK_DELAY;
	acquiredItem = (ItemEntity::enumItemType)(type - ItemEntity::itemMagicianHat);
	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);
	}
	diff --git a/src/PnjEntity.cpp b/src/PnjEntity.cpp
	index d4a697d..fa2ec76 100644
	--- a/src/PnjEntity.cpp
	+++ b/src/PnjEntity.cpp
	@@ -1,101 +1,101 @@
	#include "PnjEntity.h"
	#include "Constants.h"
	#include "StaticTextEntity.h"
	#include "sfml_game/ImageManager.h"

	PnjEntity::PnjEntity(float x, float y, int pnjType) : SpriteEntity (ImageManager::getImageManager()->getImage(IMAGE_PNJ), x, y, 64, 96)
	{
	this->x = x;
	this->y = y;

	x0 = x;
	y0 = y;

	pnjVelocity = 140.0f;

	xGoal = x0 + 180.0f;
	direction = 6;
	velocity.x = pnjVelocity;

	isSpeaking = false;
	speechTimer = 2.5f + 0.1f * (rand() % 50);
	headFrame = 2;

	- type = 17;
	+ type = ENTITY_PNJ;
	}


	void PnjEntity::animate(float delay)
	{
	if (direction == 6 && x >= xGoal)
	{
	direction = 4;
	velocity.x = -pnjVelocity;
	xGoal = x0 - 180.0f;
	}
	else if (direction == 4 && x <= xGoal)
	{
	direction = 6;
	velocity.x = pnjVelocity;
	xGoal = x0 + 180.0f;
	}

	speechTimer -= delay;
	if (speechTimer <= 0.0f)
	{
	if (isSpeaking)
	{
	isSpeaking = false;
	speechTimer = 3.0f + 0.1f * (rand() % 65);
	velocity.x = (direction == 6) ? pnjVelocity : -pnjVelocity;
	}
	else
	{
	isSpeaking = true;
	speechTimer = 5.0f;
	velocity.x = 0.0f;
	int r = rand() % 3;
	switch (r)
	{
	case 0: speech = "Best price in entire dungeon !"; break;
	case 1: speech = "Welcome in deep deep stores !"; break;
	case 2: speech = "Have look to our merchandise !"; break;
	}
	}
	}

	if (isSpeaking)
	{
	headFrame = 2 + (int)(4 * age) % 2;
	}
	else
	{
	frame = 0 + (int)(4 * age) % 2;
	headFrame = 2;
	}
	z = y + height;

	SpriteEntity::animate(delay);
	}

	void PnjEntity::render(sf::RenderWindow* app)
	{
	sprite.setPosition(x, y);

	// shadow
	sprite.setTextureRect(sf::IntRect(4 * width, 0, width, height));
	app->draw(sprite);

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

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

	if (isSpeaking)
	{
	StaticTextEntity::Write(app, speech, 20, x0, y0 - 72.0f, ALIGN_CENTER, sf::Color(255, 255, 255));
	}
	}
	diff --git a/src/RatEntity.cpp b/src/RatEntity.cpp
	index dbfe17a..2c3ed27 100644
	--- a/src/RatEntity.cpp
	+++ b/src/RatEntity.cpp
	@@ -1,71 +1,71 @@
	#include "RatEntity.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 "WitchBlastGame.h"

	RatEntity::RatEntity(float x, float y, GameMap* map)
	: EnnemyEntity (ImageManager::getImageManager()->getImage(IMAGE_RAT), x, y, map)
	{
	creatureSpeed = RAT_SPEED;
	velocity = Vector2D(creatureSpeed);
	hp = RAT_HP;
	meleeDamages = RAT_DAMAGES;

	- type = 21;
	+ type = ENTITY_ENNEMY;
	bloodColor = bloodRed;
	shadowFrame = 3;
	}

	void RatEntity::animate(float delay)
	{
	if (age > 0.0f)
	frame = ((int)(age * 5.0f)) % 2;

	EnnemyEntity::animate(delay);
	}

	void RatEntity::calculateBB()
	{
	boundingBox.left = (int)x - width / 2 + RAT_BB_LEFT;
	boundingBox.width = width - RAT_BB_WIDTH_DIFF;
	boundingBox.top = (int)y - height / 2 + RAT_BB_TOP;
	boundingBox.height = height - RAT_BB_HEIGHT_DIFF;
	}

	void RatEntity::collideMapRight()
	{
	velocity.x = -velocity.x;
	}

	void RatEntity::collideMapLeft()
	{
	velocity.x = -velocity.x;
	}

	void RatEntity::collideMapTop()
	{
	velocity.y = -velocity.y;
	}

	void RatEntity::collideMapBottom()
	{
	velocity.y = -velocity.y;
	}


	void RatEntity::dying()
	{
	isDying = true;
	SpriteEntity* deadRat = new SpriteEntity(ImageManager::getImageManager()->getImage(IMAGE_CORPSES), x, y, 64, 64);
	deadRat->setZ(OFFSET_Y);
	deadRat->setFrame(FRAME_CORPSE_RAT);
	- deadRat->setType(TYPE_CORPSE);
	+ deadRat->setType(ENTITY_CORPSE);

	for (int i = 0; i < 4; i++) parentGame->generateBlood(x, y, bloodColor);
	drop();
	SoundManager::getSoundManager()->playSound(SOUND_ENNEMY_DYING);
	}
	diff --git a/src/SlimeEntity.cpp b/src/SlimeEntity.cpp
	index 6afd219..0fce1a7 100644
	--- a/src/SlimeEntity.cpp
	+++ b/src/SlimeEntity.cpp
	@@ -1,211 +1,211 @@
	#include "SlimeEntity.h"
	#include "PlayerEntity.h"
	#include "sfml_game/SpriteEntity.h"
	#include "sfml_game/ImageManager.h"
	#include "sfml_game/SoundManager.h"
	#include "Constants.h"
	#include "WitchBlastGame.h"

	SlimeEntity::SlimeEntity(float x, float y, GameMap* map, PlayerEntity* player)
	: EnnemyEntity (ImageManager::getImageManager()->getImage(IMAGE_SLIME), x, y, map)
	{
	creatureSpeed = 0.0f;
	velocity = Vector2D(0.0f, 0.0f);
	hp = SLIME_HP;
	meleeDamages = SLIME_DAMAGES;
	this->player = player;

	- type = 22;
	+ type = ENTITY_ENNEMY;
	bloodColor = bloodGreen;
	jumpingDelay = 2.0f;
	shadowFrame = 3;

	isJumping = false;
	h = 0.0f;

	viscosity = 0.98f;
	frame = 0;
	jumpingDelay = 0.6f + 0.1f * (rand() % 20);
	}

	void SlimeEntity::animate(float delay)
	{
	if (isJumping)
	{
	hVelocity -= 700.0f * delay;

	h += hVelocity * delay;

	if (h <= 0.0f)
	{
	h = 0.0f;
	if (isFirstJumping)
	{
	isFirstJumping = false;
	hVelocity = 160.0f;
	SoundManager::getSoundManager()->playSound(SOUND_SLIME_IMAPCT);
	}
	else
	{
	jumpingDelay = 0.8f + 0.1f * (rand() % 20);
	isJumping = false;
	SoundManager::getSoundManager()->playSound(SOUND_SLIME_IMAPCT_WEAK);
	}
	}
	if (hVelocity > 0.0f) frame = 2;
	else frame = 0;
	}
	else
	{
	jumpingDelay -= delay;
	if (jumpingDelay < 0.0f)
	{
	SoundManager::getSoundManager()->playSound(SOUND_SLIME_JUMP);
	hVelocity = 500.0f + rand() % 150;
	isJumping = true;
	isFirstJumping = true;

	float randVel = 250.0f + rand() % 250;

	if (rand() % 2 == 0)
	{
	float tan = (player->getX() - x) / (player->getY() - y);
	float angle = atan(tan);

	if (player->getY() > y)
	setVelocity(Vector2D(sin(angle) * randVel,
	cos(angle) * randVel));
	else
	setVelocity(Vector2D(-sin(angle) * randVel,
	-cos(angle) * randVel));
	}
	else
	velocity = Vector2D(randVel);
	}
	else if (jumpingDelay < 0.25f)
	frame = 1;
	else frame = 0;
	}

	EnnemyEntity::animate(delay);
	}

	void SlimeEntity::render(sf::RenderWindow* app)
	{
	if (!isDying && shadowFrame > -1)
	{
	// shadow
	sprite.setPosition(x, y);
	sprite.setTextureRect(sf::IntRect(shadowFrame * width, 0, width, height));
	app->draw(sprite);
	}
	sprite.setPosition(x, y - h);
	sprite.setTextureRect(sf::IntRect(frame * width, 0, width, height));
	app->draw(sprite);

	#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 SlimeEntity::calculateBB()
	{
	boundingBox.left = (int)x - width / 2 + SLIME_BB_LEFT;
	boundingBox.width = width - SLIME_BB_WIDTH_DIFF;
	boundingBox.top = (int)y - height / 2 + SLIME_BB_TOP;
	boundingBox.height = height - SLIME_BB_HEIGHT_DIFF;
	}

	void SlimeEntity::collideMapRight()
	{
	// if (x > OFFSET_X + MAP_WIDTH * TILE_WIDTH)
	velocity.x = -velocity.x * 0.8f;
	}

	void SlimeEntity::collideMapLeft()
	{
	// if (x < OFFSET_X + MAP_WIDTH )
	velocity.x = -velocity.x * 0.8f;
	}

	void SlimeEntity::collideMapTop()
	{
	// if (y > OFFSET_Y + MAP_HEIGHT * TILE_HEIGHT)
	velocity.y = -velocity.y * 0.8f;
	}

	void SlimeEntity::collideMapBottom()
	{
	// if (y < OFFSET_Y + MAP_HEIGHT )
	velocity.y = -velocity.y * 0.8f;
	}

	bool SlimeEntity::collideWithMap(int direction)
	{
	calculateBB();

	int xTile0 = (boundingBox.left - offsetX) / tileWidth;
	int xTilef = (boundingBox.left + boundingBox.width - offsetX) / tileWidth;
	int yTile0 = (boundingBox.top - offsetY) / tileHeight;
	int yTilef = (boundingBox.top + boundingBox.height - offsetY) / tileHeight;

	if (boundingBox.top < 0) yTile0 = -1;

	for (int xTile = xTile0; xTile <= xTilef; xTile++)
	for (int yTile = yTile0; yTile <= yTilef; yTile++)
	{
	if (xTile == 0 \|\| xTile == MAP_WIDTH - 1 \|\| yTile == 0 \|\| yTile == MAP_HEIGHT - 1)
	{
	switch (direction)
	{
	case DIRECTION_LEFT:
	if (map->isLeftBlocking(xTile, yTile)) return true;
	break;

	case DIRECTION_RIGHT:
	if (map->isRightBlocking(xTile, yTile)) return true;
	break;

	case DIRECTION_TOP:
	if (map->isUpBlocking(xTile, yTile)) return true;
	break;

	case DIRECTION_BOTTOM:
	if (map->isDownBlocking(xTile, yTile)) return true;
	break;
	}
	}
	}

	return false;
	}

	void SlimeEntity::dying()
	{
	isDying = true;
	SpriteEntity* deadSlime = new SpriteEntity(ImageManager::getImageManager()->getImage(IMAGE_CORPSES), x, y, 64, 64);
	deadSlime->setZ(OFFSET_Y);
	deadSlime->setFrame(FRAME_CORPSE_SLIME);
	- deadSlime->setType(TYPE_CORPSE);
	+ deadSlime->setType(ENTITY_CORPSE);

	for (int i = 0; i < 4; i++) parentGame->generateBlood(x, y, bloodColor);

	drop();
	SoundManager::getSoundManager()->playSound(SOUND_ENNEMY_DYING);
	}

	bool SlimeEntity::canCollide()
	{
	return h <= 70.0f;
	}
	diff --git a/src/WitchBlastGame.cpp b/src/WitchBlastGame.cpp
	index ac6f207..e2c8a39 100644
	--- a/src/WitchBlastGame.cpp
	+++ b/src/WitchBlastGame.cpp
	@@ -1,889 +1,889 @@
	#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 "StaticTextEntity.h"
	#include "PnjEntity.h"
	#include "TextEntity.h"

	#include <iostream>
	#include <sstream>

	WitchBlastGame::WitchBlastGame(): Game(SCREEN_WIDTH, SCREEN_HEIGHT)
	{
	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");

	music.openFromFile("media/sound/track00.ogg");
	music.setVolume(75);
	music.setLoop(true);

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

	miniMap = NULL;
	currentMap = NULL;
	currentFloor = NULL;
	specialState = SpecialStateNone;
	}

	WitchBlastGame::~WitchBlastGame()
	{
	//dtor
	}

	void WitchBlastGame::onUpdate()
	{
	float delta = getAbsolutTime() - lastTime;
	lastTime = getAbsolutTime();
	EntityManager::getEntityManager()->animate(delta);

	if (specialState != SpecialStateNone)
	{
	timer -= delta;
	if (timer <= 0.0f)
	{
	if (specialState == SpecialStateFadeOut)
	startNewGame();
	else
	specialState = SpecialStateNone;
	}
	}
	}

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

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

	gameState = gameStateInit;

	currentFloor = new GameFloor(1);
	floorX = FLOOR_WIDTH / 2;
	floorY = FLOOR_HEIGHT / 2;

	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, 16, 12, 10);
	miniMapEntity->setX(400);
	miniMapEntity->setY(607);
	miniMapEntity->setZ(10001.0f);

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

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

	// the player
	player = new PlayerEntity(ImageManager::getImageManager()->getImage(0),
	OFFSET_X + (TILE_WIDTH * MAP_WIDTH * 0.5f),
	OFFSET_Y + (TILE_HEIGHT * MAP_HEIGHT * 0.5f));
	player->setMap(currentMap, TILE_WIDTH, TILE_HEIGHT, OFFSET_X, OFFSET_Y);
	player->setParent(this);

	// generate the map
	refreshMap();

	// first map is open
	roomClosed = false;

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

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

	// fade in
	specialState = SpecialStateFadeIn;
	timer = FADE_IN_DELAY;

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

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

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

	while (app->pollEvent(event))
	{
	// Close window : exit
	if (event.type == sf::Event::Closed)
	app->close();
	}

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


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

	if (player->isDead() && specialState == SpecialStateNone && sf::Keyboard::isKeyPressed(sf::Keyboard::Return))
	{
	specialState = SpecialStateFadeOut;
	timer = FADE_OUT_DELAY;
	}

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

	verifyDoorUnlocking();

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

	void WitchBlastGame::createFloor()
	{
	}

	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((ItemEntity::enumItemType)(ItemEntity::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())
	miniMap->setTile(i, j, currentFloor->getRoom(i, j));
	else if (n > 0 && currentFloor->getMap(i, j)->isKnown())
	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() == TYPE_BLOOD \|\| e->getType() == TYPE_CORPSE ) )
	+ 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 (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 (specialState == SpecialStateFadeIn)
	{
	// fade in
	rectangle.setFillColor(sf::Color(0, 0, 0, 255 - ((FADE_IN_DELAY - timer) / 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 (specialState == SpecialStateFadeOut)
	{
	// fade out
	rectangle.setFillColor(sf::Color(0, 0, 0, ((FADE_IN_DELAY - timer) / 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)
	{
	SpriteEntity* blood = new SpriteEntity(ImageManager::getImageManager()->getImage(IMAGE_BLOOD), x, y, 16, 16, 6);
	//deadRat->setZ(y + height);
	blood->setZ(OFFSET_Y - 1);
	int b0 = 0;
	if (bloodColor == BaseCreatureEntity::bloodGreen) b0 += 6;
	blood->setFrame(b0 + rand()%6);
	- blood->setType(TYPE_BLOOD);
	+ 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(ItemEntity::enumItemType itemType)
	{
	new ArtefactDescriptionEntity(itemType, this); //, &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)
	{
	ChestEntity* chest = new ChestEntity(v.x, v.y, CHEST_FAIRY, false);
	chest->setMap(currentMap, TILE_WIDTH, TILE_HEIGHT, OFFSET_X, OFFSET_Y);
	}
	else
	{
	ItemEntity* newItem
	= new ItemEntity( (ItemEntity::enumItemType)(ItemEntity::itemMagicianHat + bonusType), v.x ,v.y);
	newItem->setMap(currentMap, TILE_WIDTH, TILE_HEIGHT, OFFSET_X, OFFSET_Y);
	}
	}
	else if (currentMap->getRoomType() == roomTypeKey)
	{
	Vector2D v = currentMap->generateKeyRoom();
	ItemEntity* newItem
	= new ItemEntity( (ItemEntity::enumItemType)(ItemEntity::itemBossKey), v.x ,v.y);
	newItem->setMap(currentMap, TILE_WIDTH, TILE_HEIGHT, OFFSET_X, OFFSET_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(
	ItemEntity::itemHealth,
	OFFSET_X + (MAP_WIDTH / 2 - 2) * TILE_WIDTH + TILE_WIDTH / 2,
	OFFSET_Y + (MAP_HEIGHT / 2) * TILE_HEIGHT);
	item1->setMap(currentMap, TILE_WIDTH, TILE_HEIGHT, OFFSET_X, OFFSET_Y);
	item1->setMerchandise(true);

	int bonusType = getRandomEquipItem(true);
	ItemEntity* item2 = new ItemEntity(
	(ItemEntity::enumItemType)(ItemEntity::itemMagicianHat + bonusType),
	OFFSET_X + (MAP_WIDTH / 2 + 2) * TILE_WIDTH + TILE_WIDTH / 2,
	OFFSET_Y + (MAP_HEIGHT / 2) * TILE_HEIGHT);
	item2->setMap(currentMap, TILE_WIDTH, TILE_HEIGHT, OFFSET_X, OFFSET_Y);
	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);

	boss = new KingRatEntity(OFFSET_X + (MAP_WIDTH / 2 - 2) * TILE_WIDTH + TILE_WIDTH / 2,
	OFFSET_Y + (MAP_HEIGHT / 2 - 2) * TILE_HEIGHT + TILE_HEIGHT / 2,
	currentMap, player);
	}
	else if (currentMap->getRoomType() == roomTypeStarting)
	{
	currentMap->generateRoom(0);
	currentMap->setCleared(true);
	}
	else if (currentMap->getRoomType() == roomTypeExit)
	{
	currentMap->generateRoom(0);
	currentMap->setCleared(true);
	}
	else
	currentMap->randomize(currentMap->getRoomType());
	}

	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, currentMap); break;
	case MONSTER_BAT: new BatEntity(xm, ym, currentMap); break;
	case MONSTER_EVIL_FLOWER: new EvilFlowerEntity(xm, ym, currentMap, player); break;
	case MONSTER_SLIME: new SlimeEntity(xm, ym, currentMap, player); break;

	case MONSTER_KING_RAT: new KingRatEntity(xm, ym, currentMap, player); 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();
	ChestEntity* chest = new ChestEntity(v.x, v.y, CHEST_BASIC, false);
	chest->setMap(currentMap, TILE_WIDTH, TILE_HEIGHT, OFFSET_X, OFFSET_Y);
	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);
	}
	}

	int 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 bonusType;
	}

	void WitchBlastGame::verifyDoorUnlocking()
	{
	int colliding = (player->getColliding());

	if (colliding > 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;
	}
	}
	}

File Metadata

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

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions