diff --git a/src/Battling/Library/DamageLibrary.cpp b/src/Battling/Library/DamageLibrary.cpp index 9754a80..ad30347 100644 --- a/src/Battling/Library/DamageLibrary.cpp +++ b/src/Battling/Library/DamageLibrary.cpp @@ -8,7 +8,7 @@ using HitData = const CreatureLib::Battling::ExecutingAttack::HitData; uint32_t PkmnLib::Battling::DamageLibrary::GetDamage(CreatureLib::Battling::ExecutingAttack* attack, CreatureLib::Battling::Creature* target, uint8_t hitIndex, const HitData& hitData) const { - auto levelMod = static_cast(2 * attack->GetUser()->GetLevel()); + auto levelMod = static_cast(2 * attack->GetUser()->GetLevel()) / 5; auto bp = hitData.GetBasePower(); auto statMod = GetStatModifier(attack, target, hitIndex, hitData); auto damageMod = GetDamageModifier(attack, target, hitIndex, hitData); @@ -18,7 +18,7 @@ uint32_t PkmnLib::Battling::DamageLibrary::GetDamage(CreatureLib::Battling::Exec uint32_t damage; if (floatDamage < 0) { damage = 0; - } else if (floatDamage > (float)UINT32_MAX) { + } else if (floatDamage >= (float)UINT32_MAX) { damage = UINT32_MAX; } else { // TODO: C++ 20 - add [[likely]] attribute when supported by both gcc and Clang damage = static_cast(floatDamage);