No OneTemporary
Actions

Authored By

Unknown

Size

46 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/media/items.png b/media/items.png
	index 6988c9a..317c59e 100644
	Binary files a/media/items.png and b/media/items.png differ
	diff --git a/src/ArtefactDescriptionEntity.cpp b/src/ArtefactDescriptionEntity.cpp
	index d44087e..33db947 100644
	--- a/src/ArtefactDescriptionEntity.cpp
	+++ b/src/ArtefactDescriptionEntity.cpp
	@@ -1,97 +1,101 @@
	#include "ArtefactDescriptionEntity.h"
	#include "Constants.h"
	#include "sfml_game/ImageManager.h"
	#include "WitchBlastGame.h"
	#include "Items.h"

	ArtefactDescriptionEntity::ArtefactDescriptionEntity(enumItemType itemType)
	- : SpriteEntity (ImageManager::getImageManager()->getImage(IMAGE_ITEMS_EQUIP), 0, 0, ITEM_WIDTH, ITEM_HEIGHT)
	+ : SpriteEntity (ImageManager::getImageManager()->getImage(itemType >= FirstEquipItem ? IMAGE_ITEMS_EQUIP : IMAGE_ITEMS ),
	+ 0, 0, ITEM_WIDTH, ITEM_HEIGHT)
	{
	this->setLifetime(6.0f);
	imagesProLine = 10;
	- this->setFrame(itemType - FirstEquipItem);
	+ if (itemType >= FirstEquipItem)
	+ this->setFrame(itemType - FirstEquipItem);
	+ else
	+ this->setFrame(itemType);
	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->x = x0 + 50.0f;
	this->y = 500.0f;
	sprite.setScale(3.5f, 3.5f);

	z = 5000.0f;

	if (items[itemType].type == itemType)
	{
	artefactName = items[itemType].name;
	artefactDescription = items[itemType].description;
	}
	else
	{
	artefactName = "Unknown";
	artefactDescription = "Report to developper";
	}
	}

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

	game().Write(artefactName, 22, 315.0f, ARTEFACT_POS_Y + 15.0f, ALIGN_LEFT, sf::Color(255, 255, 255));
	game().Write(artefactDescription, 20, 315.0f, ARTEFACT_POS_Y + 55.0f, ALIGN_LEFT, sf::Color(255, 255, 255));
	}
	diff --git a/src/ItemEntity.cpp b/src/ItemEntity.cpp
	index d0a78d4..3a2cd4d 100644
	--- a/src/ItemEntity.cpp
	+++ b/src/ItemEntity.cpp
	@@ -1,137 +1,136 @@
	#include "ItemEntity.h"
	#include "sfml_game/ImageManager.h"
	#include "sfml_game/SpriteEntity.h"
	#include "Constants.h"
	#include "MagnetEntity.h"
	#include "WitchBlastGame.h"
	#include <iostream>
	#include <sstream>



	ItemEntity::ItemEntity(enumItemType itemType, float x, float y)
	: CollidingSpriteEntity(ImageManager::getImageManager()->getImage(itemType >= FirstEquipItem ? IMAGE_ITEMS_EQUIP : IMAGE_ITEMS), x, y, ITEM_WIDTH, ITEM_HEIGHT)
	{
	type = ENTITY_ITEM;
	this->itemType = itemType;
	frame = itemType;
	if (itemType >= FirstEquipItem) frame = itemType - FirstEquipItem;
	isMerchandise = false;
	imagesProLine = 10;
	setMap(game().getCurrentMap(), TILE_WIDTH, TILE_HEIGHT, OFFSET_X, OFFSET_Y);
	}

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

	int ItemEntity::getPrice()
	{
	return (items[itemType].price);
	}

	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() << " $";
	game().Write(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 >= FirstEquipItem)
	+ if (items[itemType].generatesStance)
	{

	game().showArtefactDescription(itemType);
	SpriteEntity* spriteItem = new SpriteEntity(
	image,
	playerEntity->getX(), playerEntity->getY() - 60.0f, ITEM_WIDTH, ITEM_HEIGHT);
	spriteItem->setFrame(frame);
	spriteItem->setImagesProLine(10);
	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/Items.h b/src/Items.h
	index fc218ef..4423298 100644
	--- a/src/Items.h
	+++ b/src/Items.h
	@@ -1,166 +1,172 @@
	#ifndef ITEMS_H
	#define ITEMS_H

	#include "Constants.h"

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

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

	ItemMagicianHat, // first equip item
	ItemLeatherBoots,
	ItemBookDualShots,
	ItemRageAmulet,
	ItemBossKey,
	ItemVibrationGloves,
	ItemMahoganyStaff,
	ItemFairy,
	ItemLeatherBelt,
	ItemBloodSnake,
	ItemGemIce,
	ItemGemIllusion,
	ItemGemStone,
	ItemGemLightning
	};

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

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

	-const int NUMBER_ITEMS = 18; /!< Total number of items /
	+const int NUMBER_ITEMS = 19; /!< Total number of items /
	/** Array with all the items and data */
	const itemStuct items[NUMBER_ITEMS] =
	{
	{
	ItemCopperCoin, "Copper coin", "A copper coin (value 1)",
	- 1, false, false, false, 1, AlignmentNone, -1, ShotTypeStandard
	+ 1, false, false, false, false, 1, AlignmentNone, -1, ShotTypeStandard
	},
	{
	ItemSilverCoin, "Silver coin", "A silver coin (value 5)",
	- 5, false, false, false, 1, AlignmentNone, -1, ShotTypeStandard
	+ 5, false, false, false, false, 1, AlignmentNone, -1, ShotTypeStandard
	},
	{
	ItemGoldCoin, "Gold coin", "A gold coin (value 20)",
	- 20, false, false, false, 1, AlignmentNone, -1, ShotTypeStandard
	+ 20, false, false, false, false, 1, AlignmentNone, -1, ShotTypeStandard
	},
	{
	itemHealth, "Health potion", "A health potion",
	- 8, false, true, false, 1, AlignmentNone, -1, ShotTypeStandard
	+ 8, false, true, false, false, 1, AlignmentNone, -1, ShotTypeStandard
	+ },
	+ {
	+ itemBossHeart, "Titan's Heart", "Increases Max HP",
	+ 250, false, false, false, true, 1, AlignmentNone, -1, ShotTypeStandard
	},
	{
	ItemMagicianHat, "Enchanter Hat", "Increases fire rate",
	- 20, true, true, true, 1, AlignmentNone, -1, ShotTypeStandard
	+ 20, true, true, true, true, 1, AlignmentNone, -1, ShotTypeStandard
	},
	{
	ItemLeatherBoots, "Leather Boots", "Increases Boots",
	- 20, true, true, true, 1, AlignmentNone, -1, ShotTypeStandard
	+ 20, true, true, true, true, 1, AlignmentNone, -1, ShotTypeStandard
	},
	{
	ItemBookDualShots, "Spell : Dual Bolts", "Shoots two bolts",
	- 20, true, true, true, 1, AlignmentNone, -1, ShotTypeStandard
	+ 20, true, true, true, true, 1, AlignmentNone, -1, ShotTypeStandard
	},
	{
	ItemRageAmulet, "Rage Amulet", "Increases fire range",
	- 20, true, true, true, 1, AlignmentNone, -1, ShotTypeStandard
	+ 20, true, true, true, true, 1, AlignmentNone, -1, ShotTypeStandard
	},
	{
	ItemBossKey, "Boss Key", "Open the Boss gate",
	- 200, true, false, false, 1, AlignmentNone, -1, ShotTypeStandard
	+ 200, true, false, false, true, 1, AlignmentNone, -1, ShotTypeStandard
	},
	{
	ItemVibrationGloves, "Vibration Gloves", "Increases bolt's speed and damages",
	- 20, true, true, true, 1, AlignmentNone, -1, ShotTypeStandard
	+ 20, true, true, true, true, 1, AlignmentNone, -1, ShotTypeStandard
	},
	{
	ItemMahoganyStaff, "Mahogany Staff", "Increases bolt's speed and damages",
	- 20, true, true, true, 1, AlignmentNone, -1, ShotTypeStandard
	+ 20, true, true, true, true, 1, AlignmentNone, -1, ShotTypeStandard
	},
	{
	ItemFairy, "Fairy", "Help you in the dungeon",
	- 20, true, false, true, 1, AlignmentNone, -1, ShotTypeStandard
	+ 20, true, false, true, true, 1, AlignmentNone, -1, ShotTypeStandard
	},
	{
	ItemLeatherBelt, "Leather Belt", "Increases fire rate",
	- 20, true, true, true, 1, AlignmentNone, -1, ShotTypeStandard
	+ 20, true, true, true, true, 1, AlignmentNone, -1, ShotTypeStandard
	},
	{
	ItemBloodSnake, "Blood Snake", "Increases damages",
	- 25, true, true, true, 1, AlignmentNone, -1, ShotTypeStandard
	+ 25, true, true, true, true, 1, AlignmentNone, -1, ShotTypeStandard
	},
	{
	ItemGemIce, "Ice Gem", "Ice attack (freeze)",
	- 25, true, true, true, 1, AlignmentNone, -1, ShotTypeIce
	+ 25, true, true, true, true, 1, AlignmentNone, -1, ShotTypeIce
	},
	{
	ItemGemIllusion, "Illusion Gem", "Illusion attack (ignore walls)",
	- 25, true, true, true, 4, AlignmentDark, -1, ShotTypeIllusion
	+ 25, true, true, true, true, 4, AlignmentDark, -1, ShotTypeIllusion
	},
	{
	ItemGemStone, "Stone Gem", "Stone attack (repulse)",
	- 25, true, true, true, 1, AlignmentNone, -1, ShotTypeStone
	+ 25, true, true, true, true, 1, AlignmentNone, -1, ShotTypeStone
	},
	{
	ItemGemLightning, "Lighting Gem", "Lightning attack (bouncing)",
	- 25, true, true, true, 1, AlignmentNone, -1, ShotTypeLightning
	+ 25, true, true, true, true, 1, AlignmentNone, -1, ShotTypeLightning
	}
	};

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

	#endif
	diff --git a/src/KingRatEntity.cpp b/src/KingRatEntity.cpp
	index 7d74f31..75bfb17 100644
	--- a/src/KingRatEntity.cpp
	+++ b/src/KingRatEntity.cpp
	@@ -1,360 +1,365 @@
	#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 <iostream>

	KingRatEntity::KingRatEntity(float x, float y)
	: EnnemyEntity (ImageManager::getImageManager()->getImage(IMAGE_KING_RAT), x, y)
	{
	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 = ENTITY_ENNEMY_BOSS;
	bloodColor = bloodRed;
	shadowFrame = 4;
	frame = 0;
	sprite.setOrigin(64.0f, 64.0f);

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

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

	hasBeenBerserk = false;

	specialState[SpecialStateIce].resistance = ResistanceImmune;
	}

	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 = (game().getPlayer()->getX() - x) / (game().getPlayer()->getY() - y);
	float angle = atan(tan);

	if (game().getPlayer()->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);

	setVelocity(Vector2D(x, y).vectorTo(game().getPlayerPosition(),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);
	}

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

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

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

	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;

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

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

	SoundManager::getSoundManager()->playSound(SOUND_KING_RAT_DIE);
	+
	+ ItemEntity* newItem = new ItemEntity(itemBossHeart, x, y);
	+ //newItem->setMap(map, TILE_WIDTH, TILE_HEIGHT, OFFSET_X, OFFSET_Y);
	+ newItem->setVelocity(Vector2D(100.0f + rand()% 250));
	+ newItem->setViscosity(0.96f);
	}

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

	game().Write( "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));
	}

	void KingRatEntity::collideWithEnnemy(GameEntity* collidingEntity)
	{
	EnnemyEntity* entity = static_cast<EnnemyEntity*>(collidingEntity);
	if (entity->getMovingStyle() == movWalking)
	{
	inflictsRecoilTo(entity);
	}
	}

	void KingRatEntity::inflictsRecoilTo(BaseCreatureEntity* targetEntity)
	{
	if (state == 4 \|\| state == 6)
	{
	Vector2D recoilVector = Vector2D(x, y).vectorTo(Vector2D(targetEntity->getX(), targetEntity->getY()), KING_RAT_RUNNING_RECOIL );
	targetEntity->giveRecoil(true, recoilVector, 1.0f);
	}
	}
	diff --git a/src/PlayerEntity.cpp b/src/PlayerEntity.cpp
	index 48a09eb..2b65170 100644
	--- a/src/PlayerEntity.cpp
	+++ b/src/PlayerEntity.cpp
	@@ -1,806 +1,826 @@
	#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 "TextEntity.h"

	#include <iostream>
	+#include <sstream>

	PlayerEntity::PlayerEntity(float x, float y)
	: BaseCreatureEntity (ImageManager::getImageManager()->getImage(IMAGE_PLAYER_BASE), x, y, 80, 128)
	{
	currentFireDelay = -1.0f;
	canFirePlayer = true;
	type = ENTITY_PLAYER;

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

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

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

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

	computePlayer();

	firingDirection = 5;
	facingDirection = 2;

	}

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

	x = newX;
	y = newY;

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

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

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

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

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

	PlayerEntity::playerStatusEnum PlayerEntity::getPlayerStatus()
	{
	return playerStatus;
	}

	void PlayerEntity::setPlayerStatus(PlayerEntity::playerStatusEnum playerStatus)
	{
	this->playerStatus = playerStatus;
	}

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

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

	void PlayerEntity::setLeavingLevel()
	{
	playerStatus = playerStatusGoingUp;
	}

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

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

	- if (acquiredItem == (int)EQUIP_FAIRY)
	- fairy = new FairyEntity(x, y - 50.0f, this);
	+ if (acquiredItem == ItemFairy) //(int)EQUIP_FAIRY)
	+ fairy = new FairyEntity(x, y - 50.0f, this);

	- if (items[itemID].specialShot != (ShotTypeStandard))
	- registerSpecialShot(itemID);
	+ if (items[acquiredItem].specialShot != (ShotTypeStandard))
	+ registerSpecialShot(acquiredItem);

	- computePlayer();
	+ computePlayer();
	+ }
	+ else
	+ {
	+ if (acquiredItem == itemBossHeart)
	+ {
	+ int hpBonus = 2 + rand() % 4;
	+ hpMax += hpBonus;
	+ hp += hpBonus;
	+ hpDisplay += hpBonus;
	+
	+ std::ostringstream oss;
	+ oss << "HP Max +" << hpBonus;
	+ TextEntity* text = new TextEntity(oss.str(), 14, x, y - 50.0f);
	+ text->setColor(TextEntity::COLOR_GREEN);
	+ text->setLifetime(2.0f);
	+ text->setWeight(-100.0f);
	+ }
	+ }
	+ playerStatus = playerStatusPlaying;
	}
	}
	// unlocking animation
	else if (playerStatus == playerStatusUnlocking)
	{
	acquireDelay -= delay;
	if (acquireDelay <= 0.0f)
	{
	playerStatus = playerStatusPlaying;
	}
	}
	if (playerStatus == playerStatusDead)
	velocity = Vector2D(0.0f, 0.0f);
	else
	testSpriteCollisions();

	collidingDirection = 0;
	BaseCreatureEntity::animate(delay);

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

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

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

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

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

	void PlayerEntity::renderHead(sf::RenderWindow* app)
	{
	if (playerStatus != playerStatusDead)
	{
	sprite.setTextureRect(sf::IntRect( (frame / 3 + spriteDx) * width, 0, width, height));
	app->draw(sprite);

	if (equip[EQUIP_ENCHANTER_HAT])
	{
	sprite.setTexture(*ImageManager::getImageManager()->getImage(IMAGE_PLAYER_EQUIP));
	if (playerStatus == playerStatusAcquire \|\| playerStatus == playerStatusUnlocking)
	sprite.setTextureRect(sf::IntRect( 0, 0, width, height));
	else
	sprite.setTextureRect(sf::IntRect( (frame / 3 + spriteDx) * width, 0, width, height));
	app->draw(sprite);
	sprite.setTexture(*ImageManager::getImageManager()->getImage(IMAGE_PLAYER_BASE));
	}
	}
	}

	void PlayerEntity::renderBody(sf::RenderWindow* app)
	{
	sprite.setTextureRect(sf::IntRect( (frame + spriteDx) * width, height, width, height));
	app->draw(sprite);

	if (equip[EQUIP_CONCENTRATION_AMULET])
	{
	sprite.setTexture(*ImageManager::getImageManager()->getImage(IMAGE_PLAYER_COLLAR));
	if (playerStatus == playerStatusAcquire \|\| playerStatus == playerStatusUnlocking)
	sprite.setTextureRect(sf::IntRect( 0, 0, width, height));
	else
	sprite.setTextureRect(sf::IntRect( (spriteDx / 3) * width, 0, width, height));

	app->draw(sprite);
	sprite.setTexture(*ImageManager::getImageManager()->getImage(IMAGE_PLAYER_BASE));
	}

	if (equip[EQUIP_LEATHER_BELT])
	{
	sprite.setTexture(*ImageManager::getImageManager()->getImage(IMAGE_PLAYER_EQUIP));
	sprite.setTextureRect(sf::IntRect( (frame + spriteDx) * width, height, width, height));
	app->draw(sprite);
	sprite.setTexture(*ImageManager::getImageManager()->getImage(IMAGE_PLAYER_BASE));
	}
	}

	void PlayerEntity::renderHands(sf::RenderWindow* app)
	{
	if (equip[EQUIP_VIBRATION_GLOVES]) sprite.setTexture(*ImageManager::getImageManager()->getImage(IMAGE_PLAYER_EQUIP));

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

	sprite.setTexture(*ImageManager::getImageManager()->getImage(IMAGE_PLAYER_BASE));
	}

	void PlayerEntity::renderFeet(sf::RenderWindow* app)
	{
	if (equip[EQUIP_LEATHER_BOOTS]) sprite.setTexture(*ImageManager::getImageManager()->getImage(IMAGE_PLAYER_EQUIP));

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

	sprite.setTexture(*ImageManager::getImageManager()->getImage(IMAGE_PLAYER_BASE));
	}

	void PlayerEntity::renderStaff(sf::RenderWindow* app)
	{
	if (equip[EQUIP_MAHOGANY_STAFF]) sprite.setTexture(*ImageManager::getImageManager()->getImage(IMAGE_PLAYER_EQUIP));
	int xSnake, ySnake;

	if (playerStatus == playerStatusAcquire \|\| playerStatus == playerStatusUnlocking)
	{
	sprite.setTextureRect(sf::IntRect( 12 * width, height * 4, width, height));
	app->draw(sprite);
	xSnake = 13 * width;
	ySnake = height * 4;
	}
	else if (isMoving() \|\| firingDirection != 5)
	{
	sprite.setTextureRect(sf::IntRect( (frame / 3 + spriteDx) * width, height * 4, width, height));
	app->draw(sprite);
	xSnake = (frame / 3 + spriteDx + 1) * width;
	ySnake = height * 4;
	}
	else
	{
	sprite.setTextureRect(sf::IntRect( (spriteDx / 3 + 14) * width, height * 4, width, height));
	app->draw(sprite);
	xSnake = (spriteDx / 3 + 14) * width;
	ySnake = 0;
	}

	if (equip[EQUIP_BLOOD_SNAKE])
	{
	sprite.setTexture(*ImageManager::getImageManager()->getImage(IMAGE_PLAYER_EQUIP));
	sprite.setTextureRect(sf::IntRect( xSnake, ySnake, width, height));
	app->draw(sprite);
	}
	sprite.setTexture(*ImageManager::getImageManager()->getImage(IMAGE_PLAYER_BASE));
	}


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

	spriteDx = 0;
	if (facingDirection == 8) spriteDx = 3;
	if (facingDirection == 4) spriteDx = 6;
	if (facingDirection == 6) spriteDx = 9;
	if (playerStatus == playerStatusAcquire \|\| playerStatus == playerStatusUnlocking) spriteDx = 12;

	if (playerStatus == playerStatusDead)
	{
	spriteDx = 13;
	// blood
	sprite.setTextureRect(sf::IntRect( width, 0, width, height));
	app->draw(sprite);
	}
	else
	{
	// shadow
	sprite.setTextureRect(sf::IntRect( 2 * width, 0, width, height));
	app->draw(sprite);
	}

	if (facingDirection == 8 \|\| facingDirection == 4)
	{
	renderStaff(app);
	renderHead(app);
	renderBody(app);
	renderFeet(app);
	renderHands(app);
	}
	else
	{
	renderBody(app);
	renderHead(app);
	renderFeet(app);
	renderStaff(app);
	renderHands(app);
	}

	// ice gem
	if (getShotType() == ShotTypeIce)
	{
	int fade;
	if (specialBoltTimer <= 0.0f) fade = 255;
	else fade = ((STATUS_FROZEN_BOLT_DELAY - specialBoltTimer) / STATUS_FROZEN_BOLT_DELAY) * 128;

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

	if (isMoving())
	{
	if (facingDirection == 2 )
	sprite.setPosition(x + 16, y + 36);
	else if (facingDirection == 8 )
	sprite.setPosition(x + 43, y + 36);
	else if (facingDirection == 4 )
	sprite.setPosition(x - 3 , y + 41);
	else
	sprite.setPosition(x + 63, y + 41);
	}
	else if (playerStatus == playerStatusAcquire \|\| playerStatus == playerStatusUnlocking)
	{
	sprite.setPosition(x + 57, y + 18);
	}
	else
	{
	if (facingDirection == 2 )
	sprite.setPosition(x + 16, y + 36);
	else if (facingDirection == 8 )
	sprite.setPosition(x + 43, y + 29);
	else if (facingDirection == 4 )
	sprite.setPosition(x + 13, y + 35);
	else
	sprite.setPosition(x + 46, y + 35);
	}

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

	sprite.setPosition(x, y);
	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;

	boundingBox.left += 25;
	boundingBox.width -= 50;
	boundingBox.top += 80.0f;
	boundingBox.height = boundingBox.height - 90.0f;
	}

	void PlayerEntity::readCollidingEntity(CollidingSpriteEntity* entity)
	{
	if (playerStatus == playerStatusDead) return;

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

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

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

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

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

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

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

	void PlayerEntity::generateBolt(float velx, float vely)
	{
	enumShotType boltType = ShotTypeStandard;

	switch (getShotType())
	{
	case ShotTypeIce:
	if (getShotType() == ShotTypeIce)
	{
	if (specialBoltTimer <= 0.0f)
	{
	boltType = ShotTypeIce;
	needInitShotType = true;
	}
	else boltType = ShotTypeStandard;
	}
	break;
	case ShotTypeStandard:
	case ShotTypeIllusion:
	case ShotTypeStone:
	case ShotTypeLightning:
	boltType = getShotType(); break;
	}


	BoltEntity* bolt = new BoltEntity(ImageManager::getImageManager()->getImage(1), x, y + 30, boltLifeTime, boltType);
	bolt->setMap(map, TILE_WIDTH, TILE_HEIGHT, OFFSET_X, OFFSET_Y);
	bolt->setDamages(fireDamages);
	bolt->setVelocity(Vector2D(velx, vely));
	}

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

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

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

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

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

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

	canFirePlayer = false;
	currentFireDelay = fireDelay;
	if (needInitShotType) initShotType();
	}
	}

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

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

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

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

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

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

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

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

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

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

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

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

	// gems
	if (getShotType() == ShotTypeIllusion) fireDamages *= 0.8f;
	}

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

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

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

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

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

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


	SpriteEntity* spriteItem = new SpriteEntity(
	ImageManager::getImageManager()->getImage(IMAGE_ITEMS_EQUIP),
	x, y - 60.0f, ITEM_WIDTH, ITEM_HEIGHT);
	spriteItem->setFrame(EQUIP_BOSS_KEY);
	spriteItem->setZ(z);
	spriteItem->setLifetime(UNLOCK_DELAY);
	}

	enumShotType PlayerEntity::getShotType()
	{
	return specialShots[specialShotIndex];
	}

	int PlayerEntity::getShotIndex()
	{
	return specialShotIndex;
	}

	void PlayerEntity::setShotIndex(int index)
	{
	specialShotIndex = index;
	}

	enumShotType PlayerEntity::getShotType(int slot)
	{
	return specialShots[slot];
	}

	void PlayerEntity::setShotType(int slot, enumShotType shotType)
	{
	specialShots[slot] = shotType;
	}

	void PlayerEntity::registerSpecialShot(int item)
	{
	bool found = false;
	int index = 1;
	while (index < SPECIAL_SHOT_SLOTS && !found)
	{
	found = specialShots[index] == ShotTypeStandard;
	if (!found) index++;
	}
	if (found)
	{
	this->specialShots[index] = items[item].specialShot;
	specialShotIndex = index;
	initShotType();
	}
	}

	void PlayerEntity::selectNextShotType()
	{
	int index = specialShotIndex + 1;
	bool found = false;
	while (index < SPECIAL_SHOT_SLOTS && !found)
	{
	if (specialShots[index] == ShotTypeStandard) index++;
	else found = true;
	}
	if (found)
	{
	specialShotIndex = index;
	initShotType();
	}
	else
	specialShotIndex = 0;

	SoundManager::getSoundManager()->playSound(SOUND_SHOT_SELECT);
	computePlayer();
	}

	void PlayerEntity::initShotType()
	{
	specialBoltTimer = STATUS_FROZEN_BOLT_DELAY;
	needInitShotType = false;
	}

File Metadata

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

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions