No OneTemporary
Actions

Authored By

Unknown

Size

29 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/media/corpses_big.png b/media/corpses_big.png
	index f0ffa83..6a46513 100644
	Binary files a/media/corpses_big.png and b/media/corpses_big.png differ
	diff --git a/src/BaseCreatureEntity.cpp b/src/BaseCreatureEntity.cpp
	index ed3a12a..6f0c9df 100644
	--- a/src/BaseCreatureEntity.cpp
	+++ b/src/BaseCreatureEntity.cpp
	@@ -1,340 +1,343 @@
	#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;
	facingDirection = 2;
	}

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

	IntCoord BaseCreatureEntity::getCurrentTile()
	{
	int xMap = (x - OFFSET_X) / TILE_WIDTH;
	int yMap = (y - OFFSET_Y) / TILE_HEIGHT;
	return (IntCoord(xMap, yMap));
	}

	BaseCreatureEntity::enumMovingStyle BaseCreatureEntity::getMovingStyle()
	{
	return movingStyle;
	}

	float BaseCreatureEntity::animateStates(float delay)
	{
	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;
	}

	void BaseCreatureEntity::animateColors(float delay)
	{
	// no color
	sprite.setColor(sf::Color(255, 255, 255, 255 ));

	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 )); // blue
	else
	sprite.setColor(sf::Color(255, fadeColor, fadeColor, 255 )); // red
	}
	else
	{
	hurting = false;
	sprite.setColor(sf::Color(255, 255, 255, 255 ));
	}
	}
	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;
	computeFacingDirection();
	// TODO ?
	}
	}
	}

	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::RenderTarget* 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::computeFacingDirection()
	{
	if (abs((int)velocity.x) > 0 && abs((int)velocity.y) > 0)
	{
	if (abs((int)velocity.x) > abs((int)velocity.y))
	{
	if (velocity.x > 0.0f) facingDirection = 6;
	else facingDirection = 4;
	}
	else
	{
	if (velocity.y > 0.0f) facingDirection = 2;
	else facingDirection = 8;
	}
	}
	}

	void BaseCreatureEntity::giveRecoil(bool stun, Vector2D velocity, float timer)
	{
	- recoil.active = true;
	- recoil.stun = stun;
	- recoil.velocity = velocity;
	- recoil.timer = timer;
	+ if (!(recoil.active && recoil.stun))
	+ {
	+ recoil.active = true;
	+ recoil.stun = stun;
	+ recoil.velocity = velocity;
	+ recoil.timer = timer;
	+ }
	}

	void BaseCreatureEntity::inflictsRecoilTo(BaseCreatureEntity* targetEntity)
	{
	}
	diff --git a/src/Constants.h b/src/Constants.h
	index 405d001..3f9b6bf 100644
	--- a/src/Constants.h
	+++ b/src/Constants.h
	@@ -1,284 +1,285 @@
	/** This file is part of Witch Blast.
	*
	* Witch Blast 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.
	*
	* Witch Blast 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 Witch Blast. 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.8";

	const std::string CONFIG_FILE = "config.dat";

	// 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 GAME_WIDTH = MAP_WIDTH * TILE_WIDTH;
	const int GAME_HEIGHT = MAP_HEIGHT * TILE_HEIGHT;

	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_BASE,
	IMAGE_PLAYER_EQUIP,
	IMAGE_PLAYER_COLLAR,
	IMAGE_BOLT,
	IMAGE_TILES,
	IMAGE_RAT,
	IMAGE_MINIMAP,
	IMAGE_DOOR,
	IMAGE_ITEMS,
	IMAGE_ITEMS_EQUIP,
	IMAGE_CHEST,
	IMAGE_BAT,
	IMAGE_FLOWER,
	IMAGE_SLIME,

	IMAGE_GIANT_SLIME,
	IMAGE_KING_RAT,

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

	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_EAT,
	SOUND_PLAYER_HIT,
	SOUND_PLAYER_DIE,
	SOUND_ENNEMY_DYING,
	SOUND_COIN_PICK_UP,
	SOUND_PAY,
	SOUND_WALL_IMPACT,
	SOUND_BIG_WALL_IMPACT,
	SOUND_KING_RAT_1,
	SOUND_KING_RAT_2,
	SOUND_KING_RAT_DIE,
	SOUND_SLIME_JUMP,
	SOUND_SLIME_IMAPCT,
	SOUND_SLIME_IMAPCT_WEAK,
	SOUND_ICE_CHARGE,
	SOUND_SHOT_SELECT,
	SOUND_HEART
	};

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

	- FRAME_CORPSE_KING_RAT
	+ FRAME_CORPSE_KING_RAT,
	+ FRAME_CORPSE_GIANT_SLIME
	};

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

	// shot types
	enum enumShotType {
	ShotTypeStandard,
	ShotTypeIce,
	ShotTypeIllusion,
	ShotTypeStone,
	ShotTypeLightning
	};

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

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

	const int ENTITY_ENNEMY_MAX = 23;

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

	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;

	// Black Rat
	const float BLACK_RAT_SPEED = 160.0f;
	const int BLACK_RAT_HP = 24;
	const int BLACK_RAT_DAMAGES = 5;

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

	// Giant Slime
	-const int GIANT_SLIME_HP = 600;
	+const int GIANT_SLIME_HP = 650;
	const int GIANT_SLIME_DAMAGES = 8;
	const int GIANT_SLIME_MISSILE_DAMAGES = 6;
	const float GIANT_SLIME_MISSILE_DELAY = 0.33f;
	const float GIANT_SLIME_FIRE_VELOCITY = 200.0f;
	const int GIANT_SLIME_BB_LEFT = 26;
	const int GIANT_SLIME_BB_WIDTH_DIFF = 52;
	const int GIANT_SLIME_BB_TOP = 64;
	const int GIANT_SLIME_BB_HEIGHT_DIFF = 12;
	const int GIANT_SLIME_SPEED = 85.0f;

	// 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 float KING_RAT_RUNNING_RECOIL = 750.0f;
	-const int KING_RAT_HP = 600;
	+const int KING_RAT_HP = 700;
	const int KING_RAT_DAMAGES = 8;

	// EFFECTS
	const float HURTING_DELAY = 0.4f;
	const float HEART_BEAT_DELAY = 1.2f;

	#endif // CONSTANTS_H_INCLUDED
	diff --git a/src/GiantSlimeEntity.cpp b/src/GiantSlimeEntity.cpp
	index a2c49a0..b9750cc 100644
	--- a/src/GiantSlimeEntity.cpp
	+++ b/src/GiantSlimeEntity.cpp
	@@ -1,342 +1,450 @@
	#include "GiantSlimeEntity.h"
	#include "BoltEntity.h"
	#include "EnnemyBoltEntity.h"
	#include "PlayerEntity.h"
	#include "SlimeEntity.h"
	#include "sfml_game/SpriteEntity.h"
	#include "sfml_game/ImageManager.h"
	#include "sfml_game/SoundManager.h"
	#include "Constants.h"
	#include "WitchBlastGame.h"

	#include <iostream>

	GiantSlimeEntity::GiantSlimeEntity(float x, float y)
	: EnnemyEntity (ImageManager::getImageManager()->getImage(IMAGE_GIANT_SLIME), x, y)
	{
	width = 128;
	height = 128;
	creatureSpeed = GIANT_SLIME_SPEED;
	velocity = Vector2D(creatureSpeed);
	hp = GIANT_SLIME_HP;
	hpDisplay = hp;
	hpMax = GIANT_SLIME_HP;
	meleeDamages = GIANT_SLIME_DAMAGES;
	+ missileDelay = GIANT_SLIME_MISSILE_DELAY;

	type = ENTITY_ENNEMY_BOSS;
	bloodColor = bloodGreen;
	shadowFrame = 3;
	frame = 0;
	sprite.setOrigin(64.0f, 64.0f);
	h = 0.0f;

	age = 0.0f;

	changeToState(0);
	slimeCounter = 0;
	slimeTimer =5.0f;

	specialState[SpecialStateIce].resistance = ResistanceImmune;
	}

	void GiantSlimeEntity::changeToState(int n)
	{
	if (n == 0) // walking
	{
	state = 0;
	counter = 8 + rand() % 7;
	timer = -1.0f;
	viscosity = 1.0f;
	}
	- else if (n == 1 \|\| n == 3) // waiting
	+ else if (n == 1 \|\| n == 3 \|\| n == 5 \|\| n == 8) // waiting
	{
	state = n;
	- timer = 2.0f;
	+ timer = 1.4f;
	setVelocity(Vector2D(0.0f, 0.0f));
	}
	else if (n == 2) // jumping
	{
	state = 2;
	timer = 4.0f;

	viscosity = 0.991f;

	SoundManager::getSoundManager()->playSound(SOUND_SLIME_JUMP);
	- hVelocity = 380.0f + rand() % 420;
	+ hVelocity = 420.0f + rand() % 380;

	isFirstJumping = true;

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

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

	if (game().getPlayer()->getY() > y)
	setVelocity(Vector2D(sin(angle) * randVel,
	cos(angle) * randVel));
	else
	setVelocity(Vector2D(-sin(angle) * randVel,
	-cos(angle) * randVel));
	}
	else
	velocity = Vector2D(randVel);
	}
	else if (n == 4) // walking
	{
	state = 4;
	- counter = 10;
	+ if (hp <= hpMax / 4)
	+ counter = 26;
	+ if (hp <= hpMax / 2)
	+ counter = 18;
	+ else
	+ counter = 12;
	timer = GIANT_SLIME_MISSILE_DELAY;
	}
	+ else if (n == 6) // jumping
	+ {
	+ state = 6;
	+ timer = 1.2f;
	+
	+ viscosity = 1.0f;
	+
	+ SoundManager::getSoundManager()->playSound(SOUND_SLIME_JUMP);
	+ hVelocity = 1200.0f;
	+ }
	+ else if (n == 7) // falling
	+ {
	+ isFalling = false;
	+ state = 7;
	+ timer = 4.0f;
	+
	+ hVelocity = -1500.0f;
	+ h = 1500;
	+ }
	}

	void GiantSlimeEntity::animate(float delay)
	{
	slimeTimer -= delay;
	if (slimeTimer <= 0.0f)
	{
	switch (slimeCounter)
	{
	case 0: new SlimeEntity(OFFSET_X + TILE_WIDTH * 1.5f, OFFSET_Y + TILE_HEIGHT * 1.5f, true); break;
	case 1: new SlimeEntity(OFFSET_X + TILE_WIDTH * (MAP_WIDTH - 2) + TILE_WIDTH * 0.5f, OFFSET_Y + TILE_HEIGHT * 1.5f, true); break;
	case 2: new SlimeEntity(OFFSET_X + TILE_WIDTH * (MAP_WIDTH - 2) + TILE_WIDTH * 0.5f, OFFSET_Y + TILE_HEIGHT * (MAP_HEIGHT - 2) + TILE_HEIGHT * 0.5f, true); break;
	case 3: new SlimeEntity(OFFSET_X + TILE_WIDTH * 1.5f, OFFSET_Y + TILE_HEIGHT * (MAP_HEIGHT - 2) + TILE_HEIGHT * 0.5f, true); break;
	}
	slimeTimer = 6.0f;
	slimeCounter ++;
	if (slimeCounter == 4) slimeCounter = 0;
	}

	timer -= delay;
	if (timer <= 0.0f)
	{
	if (state == 0) // walking
	{
	counter--;
	if (counter >= 0)
	{
	timer = 0.5f;
	- setVelocity(Vector2D(x, y).vectorTo(game().getPlayerPosition(),GIANT_SLIME_SPEED ));
	+ if (hp <= hpMax / 4)
	+ creatureSpeed = GIANT_SLIME_SPEED * 1.4f;
	+ if (hp <= hpMax / 2)
	+ creatureSpeed = GIANT_SLIME_SPEED * 1.2f;
	+ else
	+ creatureSpeed = GIANT_SLIME_SPEED;
	+
	+ setVelocity(Vector2D(x, y).vectorTo(game().getPlayerPosition(), GIANT_SLIME_SPEED ));
	}
	else
	{
	- changeToState(1);
	+ int r = rand() % 3;
	+ if (r == 0) changeToState(1);
	+ else if (r == 1) changeToState(3);
	+ else changeToState(5);
	}
	}
	- else if (state == 1) // waiting
	+ else if (state == 1) // waiting for jumping
	{
	- changeToState(2);; // jumping
	- //counter = 8 + rand() % 7;
	+ changeToState(2);
	}
	- else if (state == 2)
	+ else if (state == 2) // jumping
	{
	- changeToState(3);
	+ changeToState(8);
	}
	else if (state == 3)
	{
	changeToState(4);
	}
	else if (state == 4) // walking
	{
	counter--;
	if (counter >= 0)
	{
	- timer = GIANT_SLIME_MISSILE_DELAY;
	+ if (hp <= hpMax / 4)
	+ timer = missileDelay * 0.6f;
	+ if (hp <= hpMax / 2)
	+ timer = missileDelay * 0.8f;
	+ else
	+ timer = missileDelay;
	fire();
	}
	else
	{
	- changeToState(0);
	+ changeToState(8);
	}
	}
	+ else if (state == 5)
	+ {
	+ changeToState(6);
	+ }
	+ else if (state == 6) // jump
	+ {
	+ changeToState(7); // fall
	+ }
	+ else if (state == 7) // jump
	+ {
	+ }
	+ else if (state == 8) // jump
	+ {
	+ changeToState(0); // fall
	+ }
	}


	if (state == 0) // walking
	{
	frame = ((int)(age * 2.0f)) % 2;
	}
	- else if (state == 1) // waiting to jump
	+ else if (state == 1 \|\| state == 5) // waiting to jump
	{
	if (timer < 0.25f)
	frame = 1;
	else
	frame = 0;
	}
	else if (state == 2) // jumping
	{
	hVelocity -= 700.0f * delay;

	h += hVelocity * delay;

	if (h <= 0.0f)
	{
	if (hp <= 0)
	dying();
	else
	{
	h = 0.0f;
	if (isFirstJumping)
	{
	isFirstJumping = false;
	hVelocity = 160.0f;
	SoundManager::getSoundManager()->playSound(SOUND_SLIME_IMAPCT);
	}
	else
	{
	- //changeToState(0);
	SoundManager::getSoundManager()->playSound(SOUND_SLIME_IMAPCT_WEAK);
	+ viscosity = 0.96f;
	}
	}
	}
	if (hVelocity > 0.0f) frame = 2;
	else frame = 0;
	}
	+ else if (state == 6) // ultra jump
	+ {
	+ if (h < 2000)
	+ h += hVelocity * delay;
	+ }
	+ else if (state == 7) // ultra jump
	+ {
	+ if (!isFalling && timer <= 2.2f)
	+ {
	+ isFalling = true;
	+ x = game().getPlayer()->getX();
	+ y = game().getPlayer()->getY();
	+ // to prevent collisions
	+ if (x < OFFSET_X + TILE_WIDTH * 3) velocity.x = -1.1f;
	+ else if (x > OFFSET_X + TILE_WIDTH * (MAP_WIDTH - 3)) velocity.x = 1.1f;
	+ if (y < OFFSET_Y + TILE_HEIGHT * 3) velocity.y = -1.1f;
	+ else if (y > OFFSET_Y + TILE_HEIGHT * (MAP_HEIGHT - 3)) velocity.y = 1.1f;
	+ }
	+ if (timer < 2.3f)
	+ {
	+ h += hVelocity * delay;
	+ if (h <= 0)
	+ {
	+ h = 0;
	+ changeToState(8);
	+ game().makeShake(0.8f);
	+ SoundManager::getSoundManager()->playSound(SOUND_WALL_IMPACT);
	+ }
	+ }
	+ }

	-// else if (state == 0)

	EnnemyEntity::animate(delay);
	+
	+ if (state == 6 && timer < 0.5f)
	+ {
	+ int fade = timer * 512;
	+ if (fade < 0) fade = 0;
	+ sprite.setColor(sf::Color(255, 255, 255, fade));
	+ }
	+ else if (state == 7 && timer < 1.5f)
	+ sprite.setColor(sf::Color(255, 255, 255, 255));
	+ else if (state == 7 && timer < 2.0f)
	+ sprite.setColor(sf::Color(255, 255, 255, (2.0f - timer) * 512));
	+ else if (state == 7)
	+ sprite.setColor(sf::Color(255, 255, 255, 0));
	}

	bool GiantSlimeEntity::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 GiantSlimeEntity::calculateBB()
	{
	boundingBox.left = (int)x - width / 2 + GIANT_SLIME_BB_LEFT;
	boundingBox.width = width - GIANT_SLIME_BB_WIDTH_DIFF;
	boundingBox.top = (int)y - height / 2 + GIANT_SLIME_BB_TOP;
	boundingBox.height = height - GIANT_SLIME_BB_HEIGHT_DIFF - GIANT_SLIME_BB_TOP;
	}


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

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

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

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


	void GiantSlimeEntity::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->setFrame(FRAME_CORPSE_GIANT_SLIME - FRAME_CORPSE_KING_RAT);
	deadRat->setType(ENTITY_CORPSE);

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

	- SoundManager::getSoundManager()->playSound(SOUND_KING_RAT_DIE);
	+ if (x <= OFFSET_X + 1.5 * TILE_WIDTH) x = OFFSET_X + 1.5f * TILE_WIDTH + 2;
	+ else if (x >= OFFSET_X + TILE_WIDTH * MAP_WIDTH - 1.5f * TILE_WIDTH) x = OFFSET_X + TILE_WIDTH * MAP_WIDTH - 1.5f * TILE_WIDTH -3;
	+ if (y <= OFFSET_Y + 1.5 * TILE_HEIGHT) y = OFFSET_Y + 1.5 * TILE_HEIGHT + 2;
	+ else if (y >= OFFSET_Y + TILE_HEIGHT * MAP_HEIGHT - 1.5f * TILE_HEIGHT) x = OFFSET_Y + TILE_HEIGHT * MAP_HEIGHT - 1.5f * TILE_HEIGHT -3;
	+
	+ for (int i = 0; i < 10; i++)
	+ {
	+ game().generateBlood(xSlime, ySlime, bloodColor);
	+ new SlimeEntity(x, y, true);
	+ }
	+
	+ //SoundManager::getSoundManager()->playSound(SOUND_KING_RAT_DIE);

	ItemEntity* newItem = new ItemEntity(itemBossHeart, x, y);
	newItem->setVelocity(Vector2D(100.0f + rand()% 250));
	newItem->setViscosity(0.96f);
	}

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

	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( "Giant Slime",
	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),
	app);
	}

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

	void GiantSlimeEntity::inflictsRecoilTo(BaseCreatureEntity* targetEntity)
	{
	- if (state == 4 \|\| state == 6)
	+ if (state == 7)
	{
	Vector2D recoilVector = Vector2D(x, y).vectorTo(Vector2D(targetEntity->getX(), targetEntity->getY()), KING_RAT_RUNNING_RECOIL );
	targetEntity->giveRecoil(true, recoilVector, 1.0f);
	}
	}

	bool GiantSlimeEntity::canCollide()
	{
	return h <= 70.0f;
	}

	BaseCreatureEntity::enumMovingStyle GiantSlimeEntity::getMovingStyle()
	{
	if (h <= 70.0f)
	return movWalking;
	else
	return movFlying;
	}

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

	bolt->setVelocity(Vector2D(x, y).vectorTo(game().getPlayerPosition(),GIANT_SLIME_FIRE_VELOCITY ));
	}
	+
	diff --git a/src/GiantSlimeEntity.h b/src/GiantSlimeEntity.h
	index 6d52d8c..86f2614 100644
	--- a/src/GiantSlimeEntity.h
	+++ b/src/GiantSlimeEntity.h
	@@ -1,43 +1,45 @@
	#ifndef GIANTSLIMESPRITE_H
	#define GIANTSLIMESPRITE_H

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

	class GiantSlimeEntity : public EnnemyEntity
	{
	public:
	GiantSlimeEntity(float x, float y);
	virtual void animate(float delay);
	virtual void render(sf::RenderTarget* 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 changeToState(int n);

	virtual void collideWithEnnemy(GameEntity* collidingEntity);
	virtual void dying();

	virtual bool canCollide();
	virtual enumMovingStyle getMovingStyle();

	private:
	float timer;
	int state, counter;
	float slimeTimer;
	int slimeCounter;
	float h;
	float hVelocity;
	bool isFirstJumping;
	+ bool isFalling;
	+ float missileDelay;

	void fire();
	};

	#endif // GIANTSLIMESPRITE_H

File Metadata

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

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions