Withers now use the new invulnerable.
This commit is contained in:
parent
49f6819829
commit
619592b5a0
@ -10,9 +10,10 @@
|
|||||||
|
|
||||||
cWither::cWither(void) :
|
cWither::cWither(void) :
|
||||||
super("Wither", mtWither, "mob.wither.hurt", "mob.wither.death", 0.9, 4.0),
|
super("Wither", mtWither, "mob.wither.hurt", "mob.wither.death", 0.9, 4.0),
|
||||||
m_WitherInvulnerableTicks(220)
|
m_IsSpawnInvulnerable(true)
|
||||||
{
|
{
|
||||||
SetMaxHealth(300);
|
SetMaxHealth(300);
|
||||||
|
SetInvulnerableTicks(220);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -47,11 +48,6 @@ bool cWither::DoTakeDamage(TakeDamageInfo & a_TDI)
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (m_WitherInvulnerableTicks > 0)
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (IsArmored() && (a_TDI.DamageType == dtRangedAttack))
|
if (IsArmored() && (a_TDI.DamageType == dtRangedAttack))
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
@ -68,21 +64,14 @@ void cWither::Tick(float a_Dt, cChunk & a_Chunk)
|
|||||||
{
|
{
|
||||||
super::Tick(a_Dt, a_Chunk);
|
super::Tick(a_Dt, a_Chunk);
|
||||||
|
|
||||||
if (m_WitherInvulnerableTicks > 0)
|
if (GetInvulnerableTicks() <= 0 && m_IsSpawnInvulnerable)
|
||||||
{
|
{
|
||||||
unsigned int NewTicks = m_WitherInvulnerableTicks - 1;
|
m_World->DoExplosionAt(7.0, GetPosX(), GetPosY(), GetPosZ(), false, esWitherBirth, this);
|
||||||
|
m_IsSpawnInvulnerable = false;
|
||||||
if (NewTicks == 0)
|
}
|
||||||
{
|
else if (((GetInvulnerableTicks() % 10) == 0) && (GetInvulnerableTicks() > 10))
|
||||||
m_World->DoExplosionAt(7.0, GetPosX(), GetPosY(), GetPosZ(), false, esWitherBirth, this);
|
{
|
||||||
}
|
Heal(10);
|
||||||
|
|
||||||
m_WitherInvulnerableTicks = NewTicks;
|
|
||||||
|
|
||||||
if ((NewTicks % 10) == 0)
|
|
||||||
{
|
|
||||||
Heal(10);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
m_World->BroadcastEntityMetadata(*this);
|
m_World->BroadcastEntityMetadata(*this);
|
||||||
|
@ -17,10 +17,6 @@ public:
|
|||||||
|
|
||||||
CLASS_PROTODEF(cWither);
|
CLASS_PROTODEF(cWither);
|
||||||
|
|
||||||
unsigned int GetWitherInvulnerableTicks(void) const { return m_WitherInvulnerableTicks; }
|
|
||||||
|
|
||||||
void SetWitherInvulnerableTicks(unsigned int a_Ticks) { m_WitherInvulnerableTicks = a_Ticks; }
|
|
||||||
|
|
||||||
/** Returns whether the wither is invulnerable to arrows. */
|
/** Returns whether the wither is invulnerable to arrows. */
|
||||||
bool IsArmored(void) const;
|
bool IsArmored(void) const;
|
||||||
|
|
||||||
@ -32,8 +28,7 @@ public:
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
/** The number of ticks of invulnerability left after being initially created. Zero once invulnerability has expired. */
|
bool m_IsSpawnInvulnerable;
|
||||||
unsigned int m_WitherInvulnerableTicks;
|
|
||||||
|
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user