Page MenuHomePhabricator (Chris)
Files F102320

No OneTemporary
Actions

Size
4 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/src/SpiderWebEntity.cpp b/src/SpiderWebEntity.cpp
index d1ff4d1..fbb6597 100644
--- a/src/SpiderWebEntity.cpp
+++ b/src/SpiderWebEntity.cpp
@@ -1,151 +1,154 @@
#include "SpiderWebEntity.h"
#include "PlayerEntity.h"
#include "BoltEntity.h"
#include "sfml_game/SpriteEntity.h"
#include "sfml_game/ImageManager.h"
#include "sfml_game/SoundManager.h"
#include "Constants.h"
#include "WitchBlastGame.h"
SpiderWebEntity::SpiderWebEntity(float x, float y, bool isFromPlayer)
: EnemyEntity (ImageManager::getInstance().getImage(IMAGE_SPIDER_WEB), x, y)
{
imagesProLine = 20;
- if (isFromPlayer) type = ENTITY_ENEMY_NC;
- else type = ENTITY_ENEMY_INVOCATED;
+ type = ENTITY_ENEMY_NC;
enemyType = EnemyTypeSpiderWeb;
movingStyle = movFlying;
bloodColor = BloodNone; // web don't bleed
deathFrame = FRAME_CORPSE_SPIDER_WEB;
this->isFromPlayer = isFromPlayer;
age = 0.0f;
frame = 0;
setVelocity(Vector2D(80 + rand()% 500));
width = 128.0f;
height = 128.0f;
sprite.setOrigin(64.0f, 64.0f);
viscosity = 0.97f;
hp = 40;
hpMax = 40;
resistance[ResistanceFrozen] = ResistanceImmune;
resistance[ResistanceRecoil] = ResistanceImmune;
resistance[ResistanceFire] = ResistanceVeryLow;
resistance[ResistanceStone] = ResistanceVeryLow;
resistance[ResistancePoison] = ResistanceImmune;
canExplode = false;
if (!testEntityInMap()) isDying = true;
}
void SpiderWebEntity::animate(float delay)
{
EnemyEntity::animate(delay);
if (age <= 0.5f)
{
float scale = age * 2.0f;
sprite.setScale(scale,scale);
}
else
sprite.setScale(1.0f, 1.0f);
int color = 177 + 78 * hp / hpMax;
sprite.setColor(sf::Color(color, color, color, 255));
}
void SpiderWebEntity::calculateBB()
{
boundingBox.left = (int)x - 45;
boundingBox.width = 90;
boundingBox.top = (int)y - 45;
boundingBox.height = 90;
}
void SpiderWebEntity::collideMapRight()
{
collideWall();
}
void SpiderWebEntity::collideMapLeft()
{
collideWall();
}
void SpiderWebEntity::collideMapTop()
{
collideWall();
}
void SpiderWebEntity::collideMapBottom()
{
collideWall();
}
void SpiderWebEntity::collideWall()
{
velocity.x = 0.0f;
velocity.y = 0.0f;
}
void SpiderWebEntity::collideWithEnemy(EnemyEntity* enemyEntity)
{
if (enemyEntity->getEnemyType() != EnemyTypeSpiderLittle_invocated
+ && enemyEntity->getEnemyType() != EnemyTypeSpiderLittle
&& enemyEntity->getEnemyType() != EnemyTypeSpiderGiant
+ && enemyEntity->getEnemyType() != EnemyTypeSpiderTarantula
+ && enemyEntity->getEnemyType() != EnemyTypeSpiderTarantula_invocated
+ && enemyEntity->getEnemyType() != EnemyTypeSpiderEgg
&& enemyEntity->getEnemyType() != EnemyTypeSpiderEgg_invocated
&& enemyEntity->getEnemyType() != EnemyTypeSpiderWeb)
{
if (!enemyEntity->isSpecialStateActive(SpecialStateSlow))
{
enemyEntity->setSpecialState(SpecialStateSlow, true, 0.15f, 0.25f, 0.0f);
hurt(getHurtParams(2, ShotTypeStandard, 0, false, SourceTypeMelee, enemyEntity->getEnemyType(), false));
}
}
}
void SpiderWebEntity::drop()
{
}
void SpiderWebEntity::readCollidingEntity(CollidingSpriteEntity* entity)
{
if (!isDying && !isAgonising && collideWithEntity(entity))
{
if (entity->getType() == ENTITY_PLAYER || entity->getType() == ENTITY_BOLT )
{
PlayerEntity* playerEntity = dynamic_cast<PlayerEntity*>(entity);
BoltEntity* boltEntity = dynamic_cast<BoltEntity*>(entity);
if (!isFromPlayer && playerEntity != NULL && !playerEntity->isDead())
{
if (!playerEntity->isSpecialStateActive(SpecialStateSlow))
{
playerEntity->setSpecialState(SpecialStateSlow, true, 0.1f, 0.33f, 0.0f);
// TODO
hurt(getHurtParams(2, ShotTypeStandard, 0, false, SourceTypeMelee, EnemyTypeNone, false));
}
}
else if (!isFromPlayer && boltEntity != NULL && !boltEntity->getDying() && boltEntity->getAge() > 0.05f)
{
EnemyEntity::collideWithBolt(boltEntity);
}
}
else // collision with other enemy ?
{
if (entity->getType() >= ENTITY_ENEMY && entity->getType() <= ENTITY_ENEMY_MAX)
{
if (this != entity)
{
EnemyEntity* enemyEntity = static_cast<EnemyEntity*>(entity);
if (enemyEntity->canCollide()) collideWithEnemy(enemyEntity);
}
}
}
}
}

File Metadata

Mime Type
text/x-diff
Expires
Fri, Jan 30, 2:56 PM (5 d, 12 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
55418
Default Alt Text
(4 KB)

Event Timeline