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

Add magical critical effect

Browse Source
This commit is contained in:
Tiger Wang 2021-04-09 23:21:04 +01:00
parent 17c091a97f
commit 99bd05dff5
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/Entities/Entity.cpp
View File

@ -396,7 +396,8 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
Player->GetEquippedItem().GetHandler()->OnEntityAttack(Player, this); Player->GetEquippedItem().GetHandler()->OnEntityAttack(Player, this);
// TODO: Better damage increase, and check for enchantments (and use magic critical instead of plain) // Whether an enchantment boosted this attack's damage.
bool MagicalCriticalHit = false;
// IsOnGround() only is false if the player is moving downwards // IsOnGround() only is false if the player is moving downwards
// Ref: https://minecraft.gamepedia.com/Damage#Critical_Hits // Ref: https://minecraft.gamepedia.com/Damage#Critical_Hits
@ -405,7 +406,7 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
if ((a_TDI.DamageType == dtAttack) || (a_TDI.DamageType == dtArrowAttack)) if ((a_TDI.DamageType == dtAttack) || (a_TDI.DamageType == dtArrowAttack))
{ {
a_TDI.FinalDamage *= 1.5f; // 150% damage a_TDI.FinalDamage *= 1.5f; // 150% damage
m_World->BroadcastEntityAnimation(*this, 4); // Critical hit m_World->BroadcastEntityAnimation(*this, EntityAnimation::EntityGetsCriticalHit);
} }
} }
@ -417,6 +418,7 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
if (SharpnessLevel > 0) if (SharpnessLevel > 0)
{ {
MagicalCriticalHit = true;
a_TDI.FinalDamage += 1.25f * SharpnessLevel; a_TDI.FinalDamage += 1.25f * SharpnessLevel;
} }
else if (SmiteLevel > 0) else if (SmiteLevel > 0)
@ -432,6 +434,7 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
case mtZombiePigman: case mtZombiePigman:
case mtZombieVillager: case mtZombieVillager:
{ {
MagicalCriticalHit = true;
a_TDI.FinalDamage += 2.5f * SmiteLevel; a_TDI.FinalDamage += 2.5f * SmiteLevel;
break; break;
} }
@ -450,11 +453,13 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
case mtCaveSpider: case mtCaveSpider:
case mtSilverfish: case mtSilverfish:
{ {
MagicalCriticalHit = true;
a_TDI.FinalDamage += 2.5f * BaneOfArthropodsLevel; a_TDI.FinalDamage += 2.5f * BaneOfArthropodsLevel;
// The duration of the effect is a random value between 1 and 1.5 seconds at level I, // The duration of the effect is a random value between 1 and 1.5 seconds at level I,
// increasing the max duration by 0.5 seconds each level // increasing the max duration by 0.5 seconds each level.
// Ref: https://minecraft.gamepedia.com/Enchanting#Bane_of_Arthropods // Ref: https://minecraft.gamepedia.com/Enchanting#Bane_of_Arthropods
int Duration = 20 + GetRandomProvider().RandInt(BaneOfArthropodsLevel * 10); // Duration in ticks int Duration = 20 + GetRandomProvider().RandInt(BaneOfArthropodsLevel * 10); // Duration in ticks.
Monster->AddEntityEffect(cEntityEffect::effSlowness, Duration, 4); Monster->AddEntityEffect(cEntityEffect::effSlowness, Duration, 4);
break; break;
@ -473,6 +478,7 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
{ {
BurnTicks += 4 * (FireAspectLevel - 1); BurnTicks += 4 * (FireAspectLevel - 1);
} }
if (!IsMob() && !IsInWater()) if (!IsMob() && !IsInWater())
{ {
StartBurning(BurnTicks * 20); StartBurning(BurnTicks * 20);
@ -488,11 +494,20 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
{ {
break; break;
} }
default: StartBurning(BurnTicks * 20); default:
{
MagicalCriticalHit = true;
StartBurning(BurnTicks * 20);
}
} }
} }
} }
if (MagicalCriticalHit)
{
m_World->BroadcastEntityAnimation(*this, EntityAnimation::EntityGetsMagicalCriticalHit);
}
unsigned int ThornsLevel = 0; unsigned int ThornsLevel = 0;
const cItem ArmorItems[] = { GetEquippedHelmet(), GetEquippedChestplate(), GetEquippedLeggings(), GetEquippedBoots() }; const cItem ArmorItems[] = { GetEquippedHelmet(), GetEquippedChestplate(), GetEquippedLeggings(), GetEquippedBoots() };
for (size_t i = 0; i < ARRAYCOUNT(ArmorItems); i++) for (size_t i = 0; i < ARRAYCOUNT(ArmorItems); i++)