No OneTemporary
Actions

Authored By

Unknown

Size

34 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/media/bolt.png b/media/bolt.png
	index 231fe43..22c4a6b 100644
	Binary files a/media/bolt.png and b/media/bolt.png differ
	diff --git a/src/BoltEntity.cpp b/src/BoltEntity.cpp
	index 954d706..08baf2a 100644
	--- a/src/BoltEntity.cpp
	+++ b/src/BoltEntity.cpp
	@@ -1,137 +1,141 @@
	#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)
	+BoltEntity::BoltEntity(sf::Texture* image, float x, float y, float boltLifeTime, enumBoltType boltType) : CollidingSpriteEntity (image, x, y, BOLT_WIDTH, BOLT_HEIGHT)
	{
	lifetime = boltLifeTime;
	setDamages(INITIAL_BOLT_DAMAGES);
	type = ENTITY_BOLT;
	viscosity = 0.97f;
	frame = 0;
	+ this->boltType = boltType;
	+ if (boltType == BoltIce) frame = 2;
	}

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

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

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

	sprite.scale(renderScale, renderScale);
	}

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

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

	CollidingSpriteEntity::animate(delay);

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

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

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

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

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

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

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

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

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

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

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

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

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

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

	int getDamages();
	void setDamages(int damages);

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

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

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

	#ifndef CONSTANTS_H_INCLUDED
	#define CONSTANTS_H_INCLUDED

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

	#include <string>

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

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

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

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

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

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

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

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

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

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

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

	IMAGE_KING_RAT,

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

	IMAGE_PNJ,
	IMAGE_FAIRY
	};

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

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

	FRAME_CORPSE_KING_RAT
	};

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

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

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

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

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

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

	MONSTER_KING_RAT
	};

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

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

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

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

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

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

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

	// EFFECTS
	const float HURTING_DELAY = 0.4f;

	#endif // CONSTANTS_H_INCLUDED
	diff --git a/src/FairyEntity.cpp b/src/FairyEntity.cpp
	index 258e710..95ca574 100644
	--- a/src/FairyEntity.cpp
	+++ b/src/FairyEntity.cpp
	@@ -1,79 +1,79 @@
	#include "FairyEntity.h"
	#include "BoltEntity.h"
	#include "Constants.h"
	#include "sfml_game/ImageManager.h"
	#include "sfml_game/SoundManager.h"
	#include <iostream>

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

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

	type = ENTITY_FAMILIAR;
	//viscosity = 0.99f;

	fireDelay = -1.0f;
	}


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

	if (fireDelay > 0) fireDelay -= delay;

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

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

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

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

	viscosity = 1.0f;

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

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

	SpriteEntity::animate(delay);
	}

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

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

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

	- BoltEntity* bolt = new BoltEntity(ImageManager::getImageManager()->getImage(IMAGE_BOLT), x, y, FAIRY_BOLT_LIFE);
	+ BoltEntity* bolt = new BoltEntity(ImageManager::getImageManager()->getImage(IMAGE_BOLT), x, y, FAIRY_BOLT_LIFE, BoltStandard);
	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/PlayerEntity.cpp b/src/PlayerEntity.cpp
	index f5fae10..5919605 100644
	--- a/src/PlayerEntity.cpp
	+++ b/src/PlayerEntity.cpp
	@@ -1,655 +1,657 @@
	#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, WitchBlastGame* parent, float x = 0.0f, float y = 0.0f)
	: BaseCreatureEntity (image, parent, x, y, 64, 96)
	{
	currentFireDelay = -1.0f;
	canFirePlayer = true;
	type = ENTITY_PLAYER;

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

	boltLifeTime = INITIAL_BOLT_LIFE;

	bloodColor = bloodRed;

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

	computePlayer();

	firingDirection = 5;
	facingDirection = 2;

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

	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 (firingDirection != 5)
	facingDirection = firingDirection;
	firingDirection = 5;

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

	if (x < OFFSET_X)
	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);

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

	// ice gem
	if (equip[EQUIP_ICE_GEM])
	{
	sprite.setTextureRect(sf::IntRect(frame * width + 4, 8 *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);

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

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

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

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

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


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

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

	void PlayerEntity::readCollidingEntity(CollidingSpriteEntity* entity)
	{

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

	if (collideWithEntity(entity))
	{
	if (boltEntity != NULL && !boltEntity->getDying())
	{
	boltEntity->collide();
	hurt(boltEntity->getDamages());
	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));

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

	//firingDirection = 5;
	}
	}

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

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

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

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

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

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

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

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

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

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

	canFirePlayer = false;
	currentFireDelay = fireDelay;
	}
	}

	bool PlayerEntity::canFire()
	{
	return canFirePlayer;
	}

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

	bool 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);
	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++) 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(ENTITY_BLOOD);
	itemSprite->setVelocity(Vector2D(rand()%450));
	itemSprite->setViscosity(0.95f);
	itemSprite->setSpin( (rand() % 700) - 350.0f);
	}

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

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

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

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

	void PlayerEntity::acquireStance(enumItemType type)
	{
	velocity.x = 0.0f;
	velocity.y = 0.0f;
	playerStatus = playerStatusAcquire;
	acquireDelay = ACQUIRE_DELAY;
	acquiredItem = (enumItemType)(type - 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 = (enumItemType)(type - 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/PlayerEntity.h b/src/PlayerEntity.h
	index 12e1828..bdd21d7 100644
	--- a/src/PlayerEntity.h
	+++ b/src/PlayerEntity.h
	@@ -1,83 +1,84 @@
	#ifndef PLAYERSPRITE_H
	#define PLAYERSPRITE_H

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

	class FairyEntity;

	class PlayerEntity : public BaseCreatureEntity
	{
	public:
	PlayerEntity(sf::Texture* image, WitchBlastGame* parent, float x, float y);
	virtual void animate(float delay);
	virtual void render(sf::RenderWindow* app);

	void moveTo(float newX, float newY);

	virtual void calculateBB();
	void move(int direction);
	void fire(int direction);
	bool canFire();
	bool isMoving();
	bool isEquiped(int eq);
	void setEquiped(int item, bool eq);
	void setEntering();
	bool canMove();
	virtual void dying();
	virtual bool hurt(int damages); // return true if hurted
	bool isDead();
	float getPercentFireDelay();
	void acquireItem(enumItemType type);
	void loseItem(enumItemType itemType, bool isEquip);
	void acquireStance(enumItemType type);
	void useBossKey();

	int getGold() {return gold; }
	void setGold(int gold) { this->gold = gold; }
	void pay(int price);
	int getColliding();

	enum playerStatusEnum
	{
	playerStatusPlaying,
	playerStatusEntering,
	playerStatusAcquire,
	playerStatusUnlocking,
	playerStatusDead
	};
	protected:
	void computePlayer();
	virtual void readCollidingEntity(CollidingSpriteEntity* entity);
	void generateBolt(float velx, float vely);

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

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

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

	bool equip[NUMBER_EQUIP_ITEMS];
	+ enumBoltType boltType;

	int colliding;

	int facingDirection;
	int firingDirection;

	FairyEntity* fairy;
	};

	#endif // PLAYERSPRITE_H

File Metadata

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

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions