No OneTemporary
Actions

Authored By

Unknown

Size

48 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/BaseCreatureEntity.cpp b/src/BaseCreatureEntity.cpp
	index cbc4465..83f8f4a 100644
	--- a/src/BaseCreatureEntity.cpp
	+++ b/src/BaseCreatureEntity.cpp
	@@ -1,177 +1,305 @@
	#include "BaseCreatureEntity.h"
	#include "sfml_game/ImageManager.h"
	#include "Constants.h"

	#include "WitchBlastGame.h"

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

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

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

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

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

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

	-void BaseCreatureEntity::animate(float delay)
	+float BaseCreatureEntity::animateStates(float delay)
	{
	- if (hpDisplay > hp) hpDisplay--;
	- else if (hpDisplay < hp) hpDisplay++;
	-
	for (int i = 0; i < NB_SPECIAL_STATES; i++)
	{
	if (specialState[i].active)
	{
	specialState[i].timer -= delay;
	if (specialState[i].timer <= 0.0f) specialState[i].active = false;
	}
	}
	-
	if (specialState[SpecialStateIce].active) delay *= STATUS_FROZEN_MULT;
	+ return delay;
	+}

	- z = y + height/2;
	+void BaseCreatureEntity::animateColors(float delay)
	+{
	+ // no color
	sprite.setColor(sf::Color(255, 255, 255, 255 ));
	- if (hurting)
	+
	+ if (hurting and hp > 0)
	{
	hurtingDelay -= delay;
	if (hurtingDelay > 0.0f)
	{
	int fadeColor = (sf::Uint8)((HURTING_DELAY - hurtingDelay) * 255);
	if (hurtingType == ShotTypeIce)
	- sprite.setColor(sf::Color(fadeColor, fadeColor, 255, 255 ));
	+ sprite.setColor(sf::Color(fadeColor, fadeColor, 255, 255 )); // blue
	else
	- sprite.setColor(sf::Color(255, fadeColor, fadeColor, 255 ));
	+ sprite.setColor(sf::Color(255, fadeColor, fadeColor, 255 )); // red
	}
	else
	{
	hurting = false;
	sprite.setColor(sf::Color(255, 255, 255, 255 ));
	}
	}
	- CollidingSpriteEntity::animate(delay);
	-
	if (specialState[SpecialStateIce].active) sprite.setColor(sf::Color(100, 100, 255, 255 ));
	}

	+void BaseCreatureEntity::animateRecoil(float delay)
	+{
	+ // recoil
	+ if (recoil.active)
	+ {
	+ recoil.velocity.x *= 0.97f;
	+ recoil.velocity.y *= 0.97f;
	+
	+ recoil.timer -= delay;
	+ if (recoil.timer <= 0.0f) recoil.active = false;
	+ }
	+}
	+
	+void BaseCreatureEntity::animatePhysics(float delay)
	+{
	+ velocity.x *= viscosity;
	+ velocity.y *= viscosity;
	+
	+ float velx = velocity.x;
	+ float vely = velocity.y;
	+
	+ if (recoil.active)
	+ {
	+ if (recoil.stun)
	+ {
	+ velx = 0.0f;
	+ vely = 0.0f;
	+ }
	+ velx += recoil.velocity.x;
	+ vely += recoil.velocity.y;
	+ }
	+
	+ spin *= viscosity;
	+ angle += spin * delay;
	+
	+ if ((int)velx > 0)
	+ {
	+ x += velx * delay;
	+
	+ if (collideWithMap(DIRECTION_LEFT))
	+ {
	+ x = (float)((int)x);
	+ while (collideWithMap(DIRECTION_LEFT))
	+ x--;
	+ collideMapRight();
	+ }
	+ else if (x > map->getWidth() * tileWidth + offsetX)
	+ {
	+ exitMap(DIRECTION_RIGHT);
	+ }
	+ }
	+ else if ((int)velx < 0)
	+ {
	+ x += velx * delay;
	+
	+ if (collideWithMap(DIRECTION_RIGHT))
	+ {
	+ x = (float)((int)x);
	+ while (collideWithMap(DIRECTION_RIGHT))
	+ x++;
	+ collideMapLeft();
	+ }
	+ else if (x < offsetX)
	+ {
	+ exitMap(DIRECTION_LEFT);
	+ }
	+ }
	+
	+ vely += weight * delay;
	+ if ( vely > maxY) vely = maxY;
	+
	+ if ((int)vely > 0)
	+ {
	+ y += vely * delay;
	+
	+ if (collideWithMap(DIRECTION_BOTTOM))
	+ {
	+ y = (float)((int)y);
	+ while (collideWithMap(DIRECTION_BOTTOM))
	+ y--;
	+ collideMapBottom();
	+ }
	+ }
	+ else if ((int)vely < 0)
	+ {
	+ y += vely * delay;
	+
	+ if (collideWithMap(DIRECTION_TOP))
	+ {
	+ y = (float)((int)y);
	+ while (collideWithMap(DIRECTION_TOP))
	+ y++;
	+ collideMapTop();
	+ }
	+ }
	+
	+ if (lifetime > 0)
	+ {
	+ if (age >= lifetime) isDying = true;
	+ }
	+ age += delay;
	+}
	+
	+void BaseCreatureEntity::animate(float delay)
	+{
	+ if (hpDisplay > hp) hpDisplay--;
	+ else if (hpDisplay < hp) hpDisplay++;
	+
	+ delay = animateStates(delay);
	+ animateColors(delay);
	+ animateRecoil(delay);
	+ animatePhysics(delay);
	+
	+ z = y + height/2;
	+}
	+
	void BaseCreatureEntity::render(sf::RenderWindow* app)
	{
	if (!isDying && shadowFrame > -1)
	{
	// shadow
	sprite.setTextureRect(sf::IntRect(shadowFrame * width, 0, width, height));
	app->draw(sprite);
	}
	CollidingSpriteEntity::render(app);

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

	void BaseCreatureEntity::calculateBB()
	{
	}

	bool BaseCreatureEntity::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 (movingStyle == movWalking)
	{
	if ( dynamic_cast<DungeonMap*>(map)->isWalkable(xTile, yTile) == false ) return true;
	}
	else if (movingStyle == movFlying)
	{
	if ( dynamic_cast<DungeonMap*>(map)->isFlyable(xTile, yTile) == false ) return true;
	}
	}

	return false;
	}

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

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

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

	return true;
	}

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

	void BaseCreatureEntity::dying()
	{
	isDying = true;
	}
	+
	+void BaseCreatureEntity::giveRecoil(bool stun, Vector2D velocity, float timer)
	+{
	+ recoil.active = true;
	+ recoil.stun = stun;
	+ recoil.velocity = velocity;
	+ recoil.timer = timer;
	+}
	+
	+void BaseCreatureEntity::inflictsRecoilTo(BaseCreatureEntity* targetEntity)
	+{
	+}
	diff --git a/src/BaseCreatureEntity.h b/src/BaseCreatureEntity.h
	index e22f4a9..f3b65d1 100644
	--- a/src/BaseCreatureEntity.h
	+++ b/src/BaseCreatureEntity.h
	@@ -1,56 +1,70 @@
	#ifndef BASECREATUREENTITY_H
	#define BASECREATUREENTITY_H

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

	const int NB_SPECIAL_STATES = 1;

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

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

	bool hurting;
	float hurtingDelay;
	enumShotType hurtingType;
	enumBloodColor bloodColor;
	enumMovingStyle movingStyle;
	+
	+ struct recoilStruct
	+ {
	+ bool active;
	+ Vector2D velocity;
	+ bool stun;
	+ float timer;
	+ } recoil;
	private:
	};

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

	bool EnnemyEntity::canCollide()
	{
	return true;
	}
	diff --git a/src/KingRatEntity.cpp b/src/KingRatEntity.cpp
	index 5de7824..cefd518 100644
	--- a/src/KingRatEntity.cpp
	+++ b/src/KingRatEntity.cpp
	@@ -1,350 +1,351 @@
	#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);

	- 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_BERSERK_SPEED,
	- cos(angle) * KING_RAT_BERSERK_SPEED));
	- else
	- setVelocity(Vector2D(-sin(angle) * KING_RAT_BERSERK_SPEED,
	- -cos(angle) * KING_RAT_BERSERK_SPEED));
	+ 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;
	//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(ENTITY_CORPSE);

	for (int i = 0; i < 10; i++) game().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);
	}
	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::inflictsRecoilTo(BaseCreatureEntity* targetEntity)
	+{
	+ if (state == 4)
	+ {
	+ Vector2D recoilVector = Vector2D(x, y).vectorTo(game().getPlayerPosition(), 800 );
	+ targetEntity->giveRecoil(false, recoilVector, 1.0f);
	+ }
	+}
	diff --git a/src/KingRatEntity.h b/src/KingRatEntity.h
	index 7d94fc0..86053c6 100644
	--- a/src/KingRatEntity.h
	+++ b/src/KingRatEntity.h
	@@ -1,33 +1,34 @@
	#ifndef KINGRATSPRITE_H
	#define KINGRATSPRITE_H

	#include "EnnemyEntity.h"
	#include "PlayerEntity.h"

	class KingRatEntity : public EnnemyEntity
	{
	public:
	KingRatEntity(float x, float y);
	virtual void animate(float delay);
	virtual void render(sf::RenderWindow* app);
	virtual void calculateBB();
	+ virtual void inflictsRecoilTo(BaseCreatureEntity* targetEntity);
	protected:
	virtual void collideMapRight();
	virtual void collideMapLeft();
	virtual void collideMapTop();
	virtual void collideMapBottom();
	void afterWallCollide();
	virtual bool hurt(int damages);

	void generateGreenRats();

	//virtual void readCollidingEntity(CollidingSpriteEntity* entity);
	virtual void dying();
	private:
	float timer;
	float berserkDelay;
	int state;
	bool hasBeenBerserk;
	};

	#endif // KINGRATSPRITE_H
	diff --git a/src/PlayerEntity.cpp b/src/PlayerEntity.cpp
	index 6d83bbf..93d2551 100644
	--- a/src/PlayerEntity.cpp
	+++ b/src/PlayerEntity.cpp
	@@ -1,795 +1,799 @@
	#include "PlayerEntity.h"
	#include "BoltEntity.h"
	#include "EnnemyBoltEntity.h"
	#include "ItemEntity.h"
	#include "FairyEntity.h"
	#include "sfml_game/ImageManager.h"
	#include "sfml_game/SoundManager.h"
	#include "Constants.h"
	#include "WitchBlastGame.h"

	#include <iostream>

	PlayerEntity::PlayerEntity(float x, 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;

	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 == (int)EQUIP_FAIRY)
	fairy = new FairyEntity(x, y - 50.0f, this);

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

	computePlayer();
	}
	}
	// unlocking animation
	else if (playerStatus == playerStatusUnlocking)
	{
	acquireDelay -= delay;
	if (acquireDelay <= 0.0f)
	{
	playerStatus = playerStatusPlaying;
	}
	}
	- //z = y;
	- if (playerStatus != playerStatusDead) testSpriteCollisions();
	+ 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)
	{

	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;
	initShotType();
	}
	else boltType = ShotTypeStandard;
	}
	break;
	case ShotTypeStandard:
	case ShotTypeIllusion:
	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;
	}
	}

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

	computePlayer();
	}

	void PlayerEntity::initShotType()
	{
	specialBoltTimer = STATUS_FROZEN_BOLT_DELAY;
	}
	diff --git a/src/RatEntity.cpp b/src/RatEntity.cpp
	index f0a8dfa..9596940 100644
	--- a/src/RatEntity.cpp
	+++ b/src/RatEntity.cpp
	@@ -1,71 +1,75 @@
	#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)
	: EnnemyEntity (ImageManager::getImageManager()->getImage(IMAGE_RAT), x, y)
	{
	creatureSpeed = RAT_SPEED;
	velocity = Vector2D(creatureSpeed);
	hp = RAT_HP;
	meleeDamages = RAT_DAMAGES;

	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;
	+ if (recoil.active) recoil.velocity.x = -recoil.velocity.x;
	}

	void RatEntity::collideMapLeft()
	{
	velocity.x = -velocity.x;
	+ if (recoil.active) recoil.velocity.x = -recoil.velocity.x;
	}

	void RatEntity::collideMapTop()
	{
	velocity.y = -velocity.y;
	+ if (recoil.active) recoil.velocity.y = -recoil.velocity.y;
	}

	void RatEntity::collideMapBottom()
	{
	velocity.y = -velocity.y;
	+ if (recoil.active) recoil.velocity.y = -recoil.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(ENTITY_CORPSE);

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

File Metadata

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

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions