flewkey
/
cuberite-2a
1
0
Fork 0
Code Releases Activity

Improvements to blaze and ghast (#4547)

This commit is contained in:
Mat 2020-03-26 19:54:40 +02:00 committed by GitHub
parent d18e134e7e
commit 84f86a467e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 155 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/MobSpawner.cpp
View File

@ -123,7 +123,6 @@ bool cMobSpawner::CanSpawnHere(cChunk * a_Chunk, Vector3i a_RelPos, eMonsterType
}
case mtBlaze:
case mtGhast:
{
return (
(targetBlock == E_BLOCK_AIR) &&
@ -194,6 +193,15 @@ bool cMobSpawner::CanSpawnHere(cChunk * a_Chunk, Vector3i a_RelPos, eMonsterType
break;
}
case mtGhast:
{
return (
(targetBlock == E_BLOCK_AIR) &&
(blockAbove == E_BLOCK_AIR) &&
(random.RandBool())
);
}
case mtGuardian:
{
return (

65
src/Mobs/Blaze.cpp
View File

@ -9,7 +9,9 @@
cBlaze::cBlaze(void) :
super("Blaze", mtBlaze, "entity.blaze.hurt", "entity.blaze.death", "entity.blaze.ambient", 0.6, 1.8)
super("Blaze", mtBlaze, "entity.blaze.hurt", "entity.blaze.death", "entity.blaze.ambient", 0.6, 1.8),
m_IsCharging(false),
m_ChargeTimer(0)
{
SetGravity(-8.0f);
SetAirDrag(0.05f);
@ -34,23 +36,54 @@ void cBlaze::GetDrops(cItems & a_Drops, cEntity * a_Killer)
bool cBlaze::Attack(std::chrono::milliseconds a_Dt)
{
if ((GetTarget() != nullptr) && (m_AttackCoolDownTicksLeft == 0))
if ((GetTarget() != nullptr) && (m_AttackCoolDownTicksLeft == 0) && (!m_IsCharging))
{
// Setting this higher gives us more wiggle room for attackrate
Vector3d Speed = GetLookVector() * 20;
Speed.y = Speed.y + 1;
auto FireCharge = cpp14::make_unique<cFireChargeEntity>(this, GetPosition().addedY(1), Speed);
auto FireChargePtr = FireCharge.get();
if (!FireChargePtr->Initialize(std::move(FireCharge), *m_World))
{
return false;
}
ResetAttackCooldown();
// ToDo: Shoot 3 fireballs instead of 1.
m_IsCharging = true;
return true;
}
return false;
}
void cBlaze::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
{
super::Tick(a_Dt, a_Chunk);
if (!IsTicking())
{
// The base class tick destroyed us
return;
}
if (m_IsCharging)
{
m_ChargeTimer++;
if (
(m_ChargeTimer == 5) ||
(m_ChargeTimer == 10) ||
(m_ChargeTimer == 15)
)
{
Vector3d Speed = GetLookVector() * 20;
Speed.y = Speed.y + 1;
auto FireCharge = cpp14::make_unique<cFireChargeEntity>(this, GetPosition().addedY(1), Speed);
auto FireChargePtr = FireCharge.get();
FireChargePtr->Initialize(std::move(FireCharge), *m_World);
m_World->BroadcastSoundEffect("entity.ghast.shoot", GetPosition(), 4.0f, 1.0f);
}
}
if ((m_IsCharging) && (m_ChargeTimer > 15))
{
m_ChargeTimer = 0;
m_IsCharging = false;
ResetAttackCooldown();
}
}

9
src/Mobs/Blaze.h
View File

@ -17,6 +17,15 @@ public:
CLASS_PROTODEF(cBlaze)
virtual void Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk) override;
virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = nullptr) override;
virtual bool Attack(std::chrono::milliseconds a_Dt) override;
private:
/** Specifies whether or not the blaze has started shooting fireballs. */
bool m_IsCharging;
/** Number of ticks since the blaze started charging.
Used to create 3 successive projectiles. */
int m_ChargeTimer;
} ;

86
src/Mobs/Ghast.cpp
View File

@ -9,8 +9,13 @@
cGhast::cGhast(void) :
super("Ghast", mtGhast, "entity.ghast.hurt", "entity.ghast.death", "entity.ghast.ambient", 4, 4)
super("Ghast", mtGhast, "entity.ghast.hurt", "entity.ghast.death", "entity.ghast.ambient", 4, 4),
m_IsCharging(false),
m_FlightCooldown(5),
m_TicksUntilShot(10)
{
SetGravity(0);
SetAirDrag(0);
}
@ -34,20 +39,14 @@ void cGhast::GetDrops(cItems & a_Drops, cEntity * a_Killer)
bool cGhast::Attack(std::chrono::milliseconds a_Dt)
{
if ((GetTarget() != nullptr) && (m_AttackCoolDownTicksLeft == 0))
if ((GetTarget() != nullptr) && (m_AttackCoolDownTicksLeft == 0) && (!m_IsCharging))
{
// Setting this higher gives us more wiggle room for attackrate
Vector3d Speed = GetLookVector() * 20;
Speed.y = Speed.y + 1;
auto & Random = GetRandomProvider();
auto SoundPitchMultiplier = 1.0f + (Random.RandReal(1.0f) - Random.RandReal(1.0f)) * 0.2f;
auto GhastBall = cpp14::make_unique<cGhastFireballEntity>(this, GetPosition().addedY(1), Speed);
auto GhastBallPtr = GhastBall.get();
if (!GhastBallPtr->Initialize(std::move(GhastBall), *m_World))
{
return false;
}
ResetAttackCooldown();
m_World->BroadcastSoundEffect("entity.ghast.warn", GetPosition(), 4.0f, SoundPitchMultiplier * 0.9f);
m_IsCharging = true;
m_World->BroadcastEntityMetadata(*this);
return true;
}
return false;
@ -55,3 +54,64 @@ bool cGhast::Attack(std::chrono::milliseconds a_Dt)
bool cGhast::DoTakeDamage(TakeDamageInfo & a_TDI)
{
// No fall damage
if (a_TDI.DamageType == dtFalling)
{
return false;
}
return super::DoTakeDamage(a_TDI);
}
void cGhast::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
{
super::Tick(a_Dt, a_Chunk);
if (!IsTicking())
{
// The base class tick destroyed us
return;
}
if ((m_IsCharging) && (m_TicksUntilShot-- == 0))
{
m_TicksUntilShot = 10;
m_IsCharging = false;
m_World->BroadcastEntityMetadata(*this);
Vector3d Speed = GetLookVector() * 20;
Speed.y = Speed.y + 1;
auto GhastBall = cpp14::make_unique<cGhastFireballEntity>(this, GetPosition(), Speed);
auto GhastBallPtr = GhastBall.get();
GhastBallPtr->Initialize(std::move(GhastBall), *m_World);
m_World->BroadcastSoundEffect("entity.ghast.shoot", GetPosition(), 4.0f, 1.0f);
ResetAttackCooldown();
}
// TODO: Better flying
if (m_FlightCooldown-- == 0)
{
m_FlightCooldown = 5;
auto & Random = GetRandomProvider();
auto SpeedVector = Vector3d(Random.RandReal(-0.3, 0.3), Random.RandReal(-0.4, 0.4), Random.RandReal(-0.3, 0.3));
if (GetPosY() > 120)
{
SpeedVector = Vector3d(Random.RandReal(-0.4, 0.4), Random.RandReal(-0.45, 0.4), Random.RandReal(-0.4, 0.4));
}
AddSpeed(SpeedVector);
}
}

15
src/Mobs/Ghast.h
View File

@ -17,10 +17,23 @@ public:
CLASS_PROTODEF(cGhast)
virtual void Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk) override;
virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = nullptr) override;
virtual bool Attack(std::chrono::milliseconds a_Dt) override;
virtual bool DoTakeDamage(TakeDamageInfo & a_TDI) override;
bool IsCharging(void) const {return false; }
bool IsCharging(void) const { return m_IsCharging; }
private:
/** Specifies whether or not the ghast has started shooting a fireball. */
bool m_IsCharging;
/** Number of ticks until the ghast tries to fly to another position. */
int m_FlightCooldown;
/** Number of ticks until a projectile is created.
Only used while m_IsCharging is true. */
int m_TicksUntilShot;
} ;

2
src/Mobs/Monster.cpp
View File

@ -313,7 +313,7 @@ void cMonster::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
HandleDaylightBurning(*Chunk, WouldBurnAt(GetPosition(), *Chunk));
bool a_IsFollowingPath = false;
if (m_PathfinderActivated)
if (m_PathfinderActivated && (GetMobType() != mtGhast)) // Pathfinder is currently disabled for ghasts, which have their own flying mechanism
{
if (ReachedFinalDestination() || (m_LeashToPos != nullptr))
{