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

Merge pull request #745 from tonibm19/master

Browse Source 
Creeper fixes
This commit is contained in:
Mattes D 2014-03-02 14:58:16 +01:00
commit 04d5cab4ef
2 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/Mobs/Creeper.cpp
View File

@ -4,6 +4,7 @@
#include "Creeper.h" #include "Creeper.h"
#include "../World.h" #include "../World.h"
#include "../Entities/ProjectileEntity.h" #include "../Entities/ProjectileEntity.h"
#include "../Entities/Player.h"
@ -13,6 +14,7 @@ cCreeper::cCreeper(void) :
super("Creeper", mtCreeper, "mob.creeper.say", "mob.creeper.say", 0.6, 1.8), super("Creeper", mtCreeper, "mob.creeper.say", "mob.creeper.say", 0.6, 1.8),
m_bIsBlowing(false), m_bIsBlowing(false),
m_bIsCharged(false), m_bIsCharged(false),
m_BurnedWithFlintAndSteel(false),
m_ExplodingTimer(0) m_ExplodingTimer(0)
{ {
} }
@ -25,12 +27,25 @@ void cCreeper::Tick(float a_Dt, cChunk & a_Chunk)
{ {
super::Tick(a_Dt, a_Chunk); super::Tick(a_Dt, a_Chunk);
if (!ReachedFinalDestination()) if (!ReachedFinalDestination() && !m_BurnedWithFlintAndSteel)
{ {
m_ExplodingTimer = 0; m_ExplodingTimer = 0;
m_bIsBlowing = false; m_bIsBlowing = false;
m_World->BroadcastEntityMetadata(*this); m_World->BroadcastEntityMetadata(*this);
} }
else
{
if (m_bIsBlowing)
{
m_ExplodingTimer += 1;
}
if (m_ExplodingTimer == 30)
{
m_World->DoExplosionAt((m_bIsCharged ? 5 : 3), GetPosX(), GetPosY(), GetPosZ(), false, esMonster, this);
Destroy();
}
}
} }
@ -80,22 +95,30 @@ void cCreeper::Attack(float a_Dt)
{ {
UNUSED(a_Dt); UNUSED(a_Dt);
m_ExplodingTimer += 1;
if (!m_bIsBlowing) if (!m_bIsBlowing)
{ {
m_World->BroadcastSoundEffect("game.tnt.primed", (int)GetPosX() * 8, (int)GetPosY() * 8, (int)GetPosZ() * 8, 1.f, (float)(0.75 + ((float)((GetUniqueID() * 23) % 32)) / 64)); m_World->BroadcastSoundEffect("game.tnt.primed", (int)GetPosX() * 8, (int)GetPosY() * 8, (int)GetPosZ() * 8, 1.f, (float)(0.75 + ((float)((GetUniqueID() * 23) % 32)) / 64));
m_bIsBlowing = true; m_bIsBlowing = true;
m_World->BroadcastEntityMetadata(*this); m_World->BroadcastEntityMetadata(*this);
} }
}
if (m_ExplodingTimer == 20)
void cCreeper::OnRightClicked(cPlayer & a_Player)
{ {
m_World->DoExplosionAt((m_bIsCharged ? 5 : 3), GetPosX(), GetPosY(), GetPosZ(), false, esMonster, this); if ((a_Player.GetEquippedItem().m_ItemType == E_ITEM_FLINT_AND_STEEL))
Destroy(); {
if (!a_Player.IsGameModeCreative())
{
a_Player.UseEquippedItem();
}
m_World->BroadcastSoundEffect("game.tnt.primed", (int)GetPosX() * 8, (int)GetPosY() * 8, (int)GetPosZ() * 8, 1.f, (float)(0.75 + ((float)((GetUniqueID() * 23) % 32)) / 64));
m_bIsBlowing = true;
m_World->BroadcastEntityMetadata(*this);
m_BurnedWithFlintAndSteel = true;
} }
} }

3
src/Mobs/Creeper.h
View File

@ -21,13 +21,14 @@ public:
virtual void DoTakeDamage(TakeDamageInfo & a_TDI) override; virtual void DoTakeDamage(TakeDamageInfo & a_TDI) override;
virtual void Attack(float a_Dt) override; virtual void Attack(float a_Dt) override;
virtual void Tick(float a_Dt, cChunk & a_Chunk) override; virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
virtual void OnRightClicked(cPlayer & a_Player) override;
bool IsBlowing(void) const {return m_bIsBlowing; } bool IsBlowing(void) const {return m_bIsBlowing; }
bool IsCharged(void) const {return m_bIsCharged; } bool IsCharged(void) const {return m_bIsCharged; }
private: private:
bool m_bIsBlowing, m_bIsCharged; bool m_bIsBlowing, m_bIsCharged, m_BurnedWithFlintAndSteel;
int m_ExplodingTimer; int m_ExplodingTimer;
} ; } ;