diff --git a/src/Battling/Library/DamageLibrary.cpp b/src/Battling/Library/DamageLibrary.cpp index 54ad133..0a448f7 100644 --- a/src/Battling/Library/DamageLibrary.cpp +++ b/src/Battling/Library/DamageLibrary.cpp @@ -2,7 +2,7 @@ #include "../ScriptHandling/ScriptMacros.hpp" using namespace CreatureLib::Battling; -int DamageLibrary::GetDamage(ExecutingAttack* attack, Creature* target, uint8_t hitIndex) const { +uint32_t DamageLibrary::GetDamage(ExecutingAttack* attack, Creature* target, uint8_t hitIndex) const { auto levelMod = static_cast(2 * attack->GetUser()->GetLevel()); auto hit = attack->GetAttackDataForTarget(target)->GetHit(hitIndex); auto bp = hit->GetBasePower(); @@ -14,7 +14,7 @@ int DamageLibrary::GetDamage(ExecutingAttack* attack, Creature* target, uint8_t return damage; } -int DamageLibrary::GetBasePower(ExecutingAttack* attack, Creature* target, uint8_t hitIndex) const { +uint8_t DamageLibrary::GetBasePower(ExecutingAttack* attack, Creature* target, uint8_t hitIndex) const { auto bp = attack->GetAttack()->GetAttack()->GetBasePower(); HOOK(OverrideBasePower, attack, attack, target, hitIndex, &bp); return bp; diff --git a/src/Battling/Library/DamageLibrary.hpp b/src/Battling/Library/DamageLibrary.hpp index ae52e31..6ca7a54 100644 --- a/src/Battling/Library/DamageLibrary.hpp +++ b/src/Battling/Library/DamageLibrary.hpp @@ -8,9 +8,9 @@ namespace CreatureLib::Battling { class DamageLibrary { public: virtual ~DamageLibrary() = default; - virtual int GetDamage(ExecutingAttack* attack, Creature* target, uint8_t hitIndex) const; + virtual uint32_t GetDamage(ExecutingAttack* attack, Creature* target, uint8_t hitIndex) const; - virtual int GetBasePower(ExecutingAttack* attack, Creature* target, uint8_t hitIndex) const; + virtual uint8_t GetBasePower(ExecutingAttack* attack, Creature* target, uint8_t hitIndex) const; virtual float GetStatModifier(ExecutingAttack* attack, Creature* target, uint8_t hitIndex) const; virtual float GetDamageModifier(ExecutingAttack* attack, Creature* target, uint8_t hitIndex) const; };